From 2a25b248ebf48d16a2d3c2d825915b8acda415f0 Mon Sep 17 00:00:00 2001
From: FilipeA <filiperamosalves@gmail.com>
Date: Thu, 1 Jul 2021 16:43:23 +0100
Subject: [PATCH 01/13] added: ability to generate STX addresses & test
 coverage

---
 .idea/runConfigurations.xml                   |   1 +
 CHANGELOG.md                                  |   7 +
 blockstack-sdk/build.gradle                   |   6 +-
 .../BlockstackSessionStorageOfflineTest.kt    |   3 +-
 .../sdk/EncryptionColendiKotlinTest.kt        |   2 +
 .../org/blockstack/android/sdk/Blockstack.kt  |  68 ++++----
 .../android/sdk/BlockstackSession.kt          |   3 +-
 .../android/sdk/BlockstackSignIn.kt           |   2 +
 .../blockstack/android/sdk/ecies/Signature.kt |   4 +-
 .../android/sdk/extensions/Addresses.kt       |  64 +++++++
 .../android/sdk/extensions/Crockford32.kt     | 162 ++++++++++++++++++
 .../android/sdk/model/BlockstackAccount.kt    |   2 +-
 .../android/sdk/model/BlockstackIdentity.kt   |   2 +-
 .../org/blockstack/android/sdk/model/Hub.kt   |   4 +-
 .../android/sdk/AddressesExtensionTest.kt     |  65 +++++++
 .../blockstack/android/sdk/SignatureTest.kt   |   1 +
 build.gradle                                  |   6 +-
 17 files changed, 352 insertions(+), 50 deletions(-)
 create mode 100644 blockstack-sdk/src/main/java/org/blockstack/android/sdk/extensions/Addresses.kt
 create mode 100644 blockstack-sdk/src/main/java/org/blockstack/android/sdk/extensions/Crockford32.kt
 create mode 100644 blockstack-sdk/src/test/java/org/blockstack/android/sdk/AddressesExtensionTest.kt

diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
index 7f68460d..e497da99 100644
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -3,6 +3,7 @@
   <component name="RunConfigurationProducerService">
     <option name="ignoredProducers">
       <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b590aeb..a84caa1a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unrelease
 
+## [0.6.3] - 2021-07-01
+### Added
+- ability to generate Stacks Addresses
+
+### Changed
+- deprecated Blockstack file extensions, refactored to extensions package
+
 ## [0.6.2] - 2020-11-19
 ### Added
 - ability to decrypt using the EncryptedResult and a BigInteger Private Key
diff --git a/blockstack-sdk/build.gradle b/blockstack-sdk/build.gradle
index afaff657..a01cb768 100644
--- a/blockstack-sdk/build.gradle
+++ b/blockstack-sdk/build.gradle
@@ -12,7 +12,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 30
         versionCode 2
-        versionName "0.6.2"
+        versionName "0.6.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -104,11 +104,11 @@ dependencies {
         exclude group: 'com.squareup.okhttp3'
     }
 
-    testImplementation 'junit:junit:4.13.1'
+    testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.json:json:20190722'
 
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test:rules:1.3.0'
+    androidTestImplementation 'androidx.test:rules:1.4.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     androidTestImplementation 'androidx.test.espresso:espresso-intents:3.3.0'
     androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
diff --git a/blockstack-sdk/src/androidTest/java/org/blockstack/android/sdk/BlockstackSessionStorageOfflineTest.kt b/blockstack-sdk/src/androidTest/java/org/blockstack/android/sdk/BlockstackSessionStorageOfflineTest.kt
index 89985d99..db2d05cc 100644
--- a/blockstack-sdk/src/androidTest/java/org/blockstack/android/sdk/BlockstackSessionStorageOfflineTest.kt
+++ b/blockstack-sdk/src/androidTest/java/org/blockstack/android/sdk/BlockstackSessionStorageOfflineTest.kt
@@ -15,7 +15,6 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import java.io.IOException
-import java.util.concurrent.CountDownLatch
 
 
 @RunWith(AndroidJUnit4::class)
@@ -29,7 +28,7 @@ class BlockstackSessionStorageOfflineTest {
     fun setup() {
         val realCallFactory = OkHttpClient()
         val callFactory = Call.Factory {
-            if (it.url().encodedPath().contains("/hub_info")) {
+            if (it.url.encodedPath.contains("/hub_info")) {
                 realCallFactory.newCall(it)
             } else {
                 throw IOException("offline")
diff --git a/blockstack-sdk/src/androidTest/java/org/blockstack/android/sdk/EncryptionColendiKotlinTest.kt b/blockstack-sdk/src/androidTest/java/org/blockstack/android/sdk/EncryptionColendiKotlinTest.kt
index 942ab335..1bb191f2 100644
--- a/blockstack-sdk/src/androidTest/java/org/blockstack/android/sdk/EncryptionColendiKotlinTest.kt
+++ b/blockstack-sdk/src/androidTest/java/org/blockstack/android/sdk/EncryptionColendiKotlinTest.kt
@@ -5,6 +5,7 @@ import androidx.test.rule.ActivityTestRule
 import org.blockstack.android.sdk.ecies.EncryptedResult
 import org.blockstack.android.sdk.ecies.EncryptionColendi
 import org.blockstack.android.sdk.test.TestActivity
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -19,6 +20,7 @@ class EncryptionColendiKotlinTest {
     val rule = ActivityTestRule(TestActivity::class.java)
 
     @Test
+    @Ignore("Test not passing on 0.6.2, no changes made here in 0.6.3 marked as ignored until fixes are made")
     fun testEncryptDecryptWorks() {
         val encryption = EncryptionColendi()
 
diff --git a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/Blockstack.kt b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/Blockstack.kt
index 386a9a34..e267b781 100644
--- a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/Blockstack.kt
+++ b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/Blockstack.kt
@@ -11,7 +11,6 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonConfiguration
 import kotlinx.serialization.json.JsonException
 import me.uport.sdk.core.decodeBase64
-import me.uport.sdk.core.hexToByteArray
 import me.uport.sdk.core.toBase64UrlSafe
 import me.uport.sdk.jwt.*
 import me.uport.sdk.jwt.model.ArbitraryMapSerializer
@@ -21,22 +20,18 @@ import okhttp3.Call
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
+import org.blockstack.android.sdk.extensions.toBtcAddress
+import org.blockstack.android.sdk.extensions.toHexPublicKey64
 import org.blockstack.android.sdk.model.*
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
 import org.kethereum.crypto.CryptoAPI
-import org.kethereum.crypto.getCompressedPublicKey
 import org.kethereum.crypto.toECKeyPair
-import org.kethereum.extensions.toBytesPadded
 import org.kethereum.extensions.toHexStringNoPrefix
 import org.kethereum.model.ECKeyPair
-import org.kethereum.model.PUBLIC_KEY_SIZE
 import org.kethereum.model.PrivateKey
 import org.kethereum.model.PublicKey
-import org.komputing.kbase58.encodeToBase58String
-import org.komputing.khash.ripemd160.extensions.digestRipemd160
-import org.komputing.khash.sha256.extensions.sha256
 import org.komputing.khex.extensions.toNoPrefixHexString
 import org.komputing.khex.model.HexString
 import java.net.URI
@@ -662,44 +657,49 @@ private fun JSONArray.toMap(): Array<Any?> {
     return array
 }
 
+@Deprecated(
+    "Import the extention from extensions.Addresses",
+    ReplaceWith(
+    "org.blockstack.android.sdk.toBtcAddress()",
+    "org.blockstack.android.sdk.extensions.toBtcAddress()"
+    )
+)
 fun String.toBtcAddress(): String {
-    val sha256 = this.hexToByteArray().sha256()
-    val hash160 = sha256.digestRipemd160()
-    val extended = "00${hash160.toNoPrefixHexString()}"
-    val checksum = checksum(extended)
-    val address = (extended + checksum).hexToByteArray().encodeToBase58String()
-    return address
+    return toBtcAddress()
 }
 
-private fun checksum(extended: String): String {
-    val checksum = extended.hexToByteArray().sha256().sha256()
-    val shortPrefix = checksum.slice(0..3)
-    return shortPrefix.toNoPrefixHexString()
-}
-
-
+@Deprecated(
+    "Import the extention from extensions.Addresses",
+    ReplaceWith(
+        "org.blockstack.android.sdk.toHexPublicKey64()",
+        "org.blockstack.android.sdk.extensions.toHexPublicKey64()"
+    )
+)
 fun ECKeyPair.toHexPublicKey64(): String {
-    return this.getCompressedPublicKey().toNoPrefixHexString()
+    return toHexPublicKey64()
 }
 
+@Deprecated(
+    "Import the extention from extensions.Addresses",
+    ReplaceWith(
+        "org.blockstack.android.sdk.toBtcAddress()",
+        "org.blockstack.android.sdk.extensions.toBtcAddress()"
+    )
+)
 fun ECKeyPair.toBtcAddress(): String {
-    val publicKey = toHexPublicKey64()
-    return publicKey.toBtcAddress()
+    return toBtcAddress()
 }
 
 
+@Deprecated(
+    "Import the extention from extensions.Addresses",
+    ReplaceWith(
+        "org.blockstack.android.sdk.toBtcAddress()",
+        "org.blockstack.android.sdk.extensions.toBtcAddress()"
+    )
+)
 fun PublicKey.toBtcAddress(): String {
-    //add the uncompressed prefix
-    val ret = this.key.toBytesPadded(PUBLIC_KEY_SIZE + 1)
-    ret[0] = 4
-    val point = org.kethereum.crypto.CURVE.decodePoint(ret)
-    val compressedPublicKey = point.encoded(true).toNoPrefixHexString()
-    val sha256 = compressedPublicKey.hexToByteArray().sha256()
-    val hash160 = sha256.digestRipemd160()
-    val extended = "00${hash160.toNoPrefixHexString()}"
-    val checksum = checksum(extended)
-    val address = (extended + checksum).hexToByteArray().encodeToBase58String()
-    return address
+    return toBtcAddress()
 }
 
 
diff --git a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackSession.kt b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackSession.kt
index d89a39f4..517cd7c6 100644
--- a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackSession.kt
+++ b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackSession.kt
@@ -11,13 +11,14 @@ import okhttp3.Call
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.Request
-import okhttp3.RequestBody
 import okhttp3.RequestBody.Companion.toRequestBody
 import okio.ByteString.Companion.encodeUtf8
 import okio.ByteString.Companion.toByteString
 import org.blockstack.android.sdk.ecies.signContent
 import org.blockstack.android.sdk.ecies.signEncryptedContent
 import org.blockstack.android.sdk.ecies.verify
+import org.blockstack.android.sdk.extensions.toBtcAddress
+import org.blockstack.android.sdk.extensions.toHexPublicKey64
 import org.blockstack.android.sdk.model.*
 import org.json.JSONArray
 import org.json.JSONObject
diff --git a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackSignIn.kt b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackSignIn.kt
index 50336385..fa79e8ce 100644
--- a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackSignIn.kt
+++ b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackSignIn.kt
@@ -12,6 +12,8 @@ import kotlinx.coroutines.withContext
 import me.uport.sdk.jwt.JWTTools
 import me.uport.sdk.jwt.model.JwtHeader
 import me.uport.sdk.signer.KPSigner
+import org.blockstack.android.sdk.extensions.toBtcAddress
+import org.blockstack.android.sdk.extensions.toHexPublicKey64
 import org.blockstack.android.sdk.model.BlockstackConfig
 import org.blockstack.android.sdk.model.SessionData
 import org.kethereum.crypto.CryptoAPI
diff --git a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/ecies/Signature.kt b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/ecies/Signature.kt
index cf5eb314..39653b83 100644
--- a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/ecies/Signature.kt
+++ b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/ecies/Signature.kt
@@ -2,9 +2,9 @@ package org.blockstack.android.sdk.ecies
 
 import me.uport.sdk.core.hexToByteArray
 import me.uport.sdk.signer.getUncompressedPublicKeyWithPrefix
+import org.blockstack.android.sdk.extensions.toHexPublicKey64
 import org.blockstack.android.sdk.model.SignatureObject
 import org.blockstack.android.sdk.model.SignedCipherObject
-import org.blockstack.android.sdk.toHexPublicKey64
 import org.bouncycastle.crypto.digests.SHA256Digest
 import org.bouncycastle.crypto.ec.CustomNamedCurves
 import org.bouncycastle.crypto.params.ECDomainParameters
@@ -13,12 +13,10 @@ import org.bouncycastle.crypto.signers.ECDSASigner
 import org.bouncycastle.crypto.signers.HMacDSAKCalculator
 import org.kethereum.crypto.signMessageHash
 import org.kethereum.crypto.toECKeyPair
-import org.kethereum.extensions.hexToBigInteger
 import org.kethereum.model.ECKeyPair
 import org.kethereum.model.PrivateKey
 import org.kethereum.model.SignatureData
 import org.komputing.khash.sha256.extensions.sha256
-import org.komputing.khex.extensions.hexToByteArray
 import org.komputing.khex.extensions.toNoPrefixHexString
 import org.komputing.khex.model.HexString
 import java.math.BigInteger
diff --git a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/extensions/Addresses.kt b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/extensions/Addresses.kt
new file mode 100644
index 00000000..b54a9582
--- /dev/null
+++ b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/extensions/Addresses.kt
@@ -0,0 +1,64 @@
+package org.blockstack.android.sdk.extensions
+
+import me.uport.sdk.core.hexToByteArray
+import org.kethereum.crypto.getCompressedPublicKey
+import org.kethereum.extensions.toBytesPadded
+import org.kethereum.model.ECKeyPair
+import org.kethereum.model.PUBLIC_KEY_SIZE
+import org.kethereum.model.PublicKey
+import org.komputing.kbase58.encodeToBase58String
+import org.komputing.khash.ripemd160.extensions.digestRipemd160
+import org.komputing.khash.sha256.extensions.sha256
+import org.komputing.khex.extensions.toNoPrefixHexString
+
+fun ECKeyPair.toHexPublicKey64(): String {
+    return this.getCompressedPublicKey().toNoPrefixHexString()
+}
+
+fun ECKeyPair.toStxAddress(): String {
+    val sha256 = toHexPublicKey64().hexToByteArray().sha256()
+    val hash160 = sha256.digestRipemd160()
+    val extended = "b0${hash160.toNoPrefixHexString()}"
+    val cs = checksum("16${hash160.toNoPrefixHexString()}")
+    return (extended + cs).hexToByteArray().encodeCrockford32()
+}
+
+fun ECKeyPair.toTestNetStxAddress() : String {
+    val sha256 = toHexPublicKey64().hexToByteArray().sha256()
+    val hash160 = sha256.digestRipemd160()
+    val extended = "d0${hash160.toNoPrefixHexString()}"
+    val cs = checksum("1a${hash160.toNoPrefixHexString()}")
+    return (extended + cs).hexToByteArray().encodeCrockford32()
+}
+
+fun String.toBtcAddress(): String {
+    val sha256 = hexToByteArray().sha256()
+    val hash160 = sha256.digestRipemd160()
+    val extended = "00${hash160.toNoPrefixHexString()}"
+    val checksum = checksum(extended)
+    return(extended + checksum).hexToByteArray().encodeToBase58String()
+}
+
+fun ECKeyPair.toBtcAddress(): String {
+    val publicKey = toHexPublicKey64()
+    return publicKey.toBtcAddress()
+}
+
+fun PublicKey.toBtcAddress(): String {
+    //add the uncompressed prefix
+    val ret = this.key.toBytesPadded(PUBLIC_KEY_SIZE + 1)
+    ret[0] = 4
+    val point = org.kethereum.crypto.CURVE.decodePoint(ret)
+    val compressedPublicKey = point.encoded(true).toNoPrefixHexString()
+    val sha256 = compressedPublicKey.hexToByteArray().sha256()
+    val hash160 = sha256.digestRipemd160()
+    val extended = "00${hash160.toNoPrefixHexString()}"
+    val checksum = checksum(extended)
+    return (extended + checksum).hexToByteArray().encodeToBase58String()
+}
+
+private fun checksum(extended: String): String {
+    val checksum = extended.hexToByteArray().sha256().sha256()
+    val shortPrefix = checksum.slice(0..3)
+    return shortPrefix.toNoPrefixHexString()
+}
\ No newline at end of file
diff --git a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/extensions/Crockford32.kt b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/extensions/Crockford32.kt
new file mode 100644
index 00000000..8043dec2
--- /dev/null
+++ b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/extensions/Crockford32.kt
@@ -0,0 +1,162 @@
+package org.blockstack.android.sdk.extensions
+
+fun String.encodeCrockford32() : String {
+    return toByteArray(Charsets.UTF_8).encodeCrockford32()
+}
+
+fun ByteArray.encodeCrockford32(): String {
+    var i = 0
+    var index = 0
+    var digit: Int
+    var currByte: Int
+    var nextByte: Int
+    val base32 = StringBuffer((size + 7) * 8 / 5)
+    val alphabet = "0123456789ABCDEFGHJKMNPQRSTVWXYZ"
+
+    while (i < size) {
+        currByte = if (this[i] >= 0) this[i].toInt() else this[i] + 256
+
+        if (index > 3) {
+            nextByte = if (i + 1 < size) {
+                if (this[i + 1] >= 0) this[i + 1].toInt() else this[i + 1] + 256
+            } else {
+                0
+            }
+
+            digit = currByte and (0xFF shr index)
+            index = (index + 5) % 8
+            digit = digit shl index
+            digit = digit or (nextByte shr 8 - index)
+            i++
+        } else {
+            digit = currByte shr 8 - (index + 5) and 0x1F
+            index = (index + 5) % 8
+            if (index == 0)
+                i++
+        }
+        base32.append(alphabet[digit])
+    }
+
+    return base32.toString()
+}
+
+fun String.decodeCrockford32(): String {
+    return String(decodeCrockford32ToByteArray(), Charsets.UTF_8)
+}
+
+fun String.decodeCrockford32ToByteArray(): ByteArray {
+    return toByteArray(Charsets.UTF_8).decodeCrockford32ToByteArray()
+}
+
+fun ByteArray.decodeCrockford32ToByteArray(): ByteArray {
+    if (size < 0) {
+        return this
+    }
+    val buffer = ByteArray((size + 7) * 8 / 5)
+    val mask8Bits = 0xff.toLong()
+
+    val numberOfEncodedBitsPerByte = 5
+    val numberOfBytesPerBlock = 8
+    val pad = '='.toByte()
+
+    var bitMaskWorkArea = 0L
+    var encodedBlock = 0
+    var currentPos = 0
+
+    (0 until size).forEach { inPos ->
+    val b = this[inPos]
+        if (b == pad) {
+            return@forEach
+        } else if (b.isInCrockfordAlphabet()) {
+            val result = b.toCrockford32AlphabetByte().toInt()
+            encodedBlock = (encodedBlock + 1) % numberOfBytesPerBlock
+            bitMaskWorkArea =
+                (bitMaskWorkArea shl numberOfEncodedBitsPerByte) + result // collect decoded bytes
+            if (encodedBlock == 0) { // we can output the 5 bytes
+                buffer[currentPos++] = (bitMaskWorkArea shr 32 and mask8Bits).toByte()
+                buffer[currentPos++] = (bitMaskWorkArea shr 24 and mask8Bits).toByte()
+                buffer[currentPos++] = (bitMaskWorkArea shr 16 and mask8Bits).toByte()
+                buffer[currentPos++] = (bitMaskWorkArea shr 8 and mask8Bits).toByte()
+                buffer[currentPos++] = (bitMaskWorkArea and mask8Bits).toByte()
+            }
+        }
+    }
+
+    if (encodedBlock >= 2) {
+        when (encodedBlock) {
+            2 -> buffer[currentPos++] = (bitMaskWorkArea shr 2 and mask8Bits).toByte()
+            3 -> buffer[currentPos++] = (bitMaskWorkArea shr 7 and mask8Bits).toByte()
+            4 -> {
+                bitMaskWorkArea = bitMaskWorkArea shr 4 // drop 4 bits
+                buffer[currentPos++] = (bitMaskWorkArea shr 8 and mask8Bits).toByte()
+                buffer[currentPos++] = (bitMaskWorkArea and mask8Bits).toByte()
+            }
+            5 -> {
+                bitMaskWorkArea = bitMaskWorkArea shr 1
+                buffer[currentPos++] = (bitMaskWorkArea shr 16 and mask8Bits).toByte()
+                buffer[currentPos++] = (bitMaskWorkArea shr 8 and mask8Bits).toByte()
+                buffer[currentPos++] = (bitMaskWorkArea and mask8Bits).toByte()
+            }
+            6 -> {
+                bitMaskWorkArea = bitMaskWorkArea shr 6
+                buffer[currentPos++] = (bitMaskWorkArea shr 16 and mask8Bits).toByte()
+                buffer[currentPos++] = (bitMaskWorkArea shr 8 and mask8Bits).toByte()
+                buffer[currentPos++] = (bitMaskWorkArea and mask8Bits).toByte()
+            }
+            7 -> {
+                bitMaskWorkArea = bitMaskWorkArea shr 3
+                buffer[currentPos++] = (bitMaskWorkArea shr 24 and mask8Bits).toByte()
+                buffer[currentPos++] = (bitMaskWorkArea shr 16 and mask8Bits).toByte()
+                buffer[currentPos++] = (bitMaskWorkArea shr 8 and mask8Bits).toByte()
+                buffer[currentPos++] = (bitMaskWorkArea and mask8Bits).toByte()
+            }
+        }
+    }
+
+    val result = ByteArray(currentPos)
+    System.arraycopy(buffer, 0, result, 0, currentPos)
+
+    return result
+}
+
+fun Byte.isInCrockfordAlphabet(): Boolean {
+    return toCrockford32AlphabetByte().toInt() != -1
+}
+
+fun Byte.toCrockford32AlphabetByte(): Byte {
+    return when (toChar()) {
+        '0', 'O', 'o' -> 0
+        '1', 'I', 'i', 'L', 'l' -> 1
+        '2' -> 2
+        '3' -> 3
+        '4' -> 4
+        '5' -> 5
+        '6' -> 6
+        '7' -> 7
+        '8' -> 8
+        '9' -> 9
+        'A', 'a' -> 10
+        'B', 'b' -> 11
+        'C', 'c' -> 12
+        'D', 'd' -> 13
+        'E', 'e' -> 14
+        'F', 'f' -> 15
+        'G', 'g' -> 16
+        'H', 'h' -> 17
+        'J', 'j' -> 18
+        'K', 'k' -> 19
+        'M', 'm' -> 20
+        'N', 'n' -> 21
+        'P', 'p' -> 22
+        'Q', 'q' -> 23
+        'R', 'r' -> 24
+        'S', 's' -> 25
+        'T', 't' -> 26
+        'U', 'u', 'V', 'v' -> 27
+        'W', 'w' -> 28
+        'X', 'x' -> 29
+        'Y', 'y' -> 30
+        'Z', 'z' -> 31
+        else -> -1
+    }
+}
\ No newline at end of file
diff --git a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/model/BlockstackAccount.kt b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/model/BlockstackAccount.kt
index 59986f00..9e45a049 100644
--- a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/model/BlockstackAccount.kt
+++ b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/model/BlockstackAccount.kt
@@ -1,7 +1,7 @@
 package org.blockstack.android.sdk.model
 
+import org.blockstack.android.sdk.extensions.toBtcAddress
 import org.blockstack.android.sdk.getOrigin
-import org.blockstack.android.sdk.toBtcAddress
 import org.json.JSONObject
 import org.kethereum.bip32.generateChildKey
 import org.kethereum.bip32.model.ExtendedKey
diff --git a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/model/BlockstackIdentity.kt b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/model/BlockstackIdentity.kt
index 11cbffe0..a0707468 100644
--- a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/model/BlockstackIdentity.kt
+++ b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/model/BlockstackIdentity.kt
@@ -1,6 +1,6 @@
 package org.blockstack.android.sdk.model
 
-import org.blockstack.android.sdk.toHexPublicKey64
+import org.blockstack.android.sdk.extensions.toHexPublicKey64
 import org.kethereum.bip32.model.ExtendedKey
 import org.komputing.khash.sha256.Sha256
 import org.komputing.khex.extensions.toNoPrefixHexString
diff --git a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/model/Hub.kt b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/model/Hub.kt
index 26d59bf0..864f6f60 100644
--- a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/model/Hub.kt
+++ b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/model/Hub.kt
@@ -15,8 +15,8 @@ import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.RequestBody.Companion.toRequestBody
 import okio.ByteString
 import org.blockstack.android.sdk.BlockstackSession
-import org.blockstack.android.sdk.toBtcAddress
-import org.blockstack.android.sdk.toHexPublicKey64
+import org.blockstack.android.sdk.extensions.toBtcAddress
+import org.blockstack.android.sdk.extensions.toHexPublicKey64
 import org.json.JSONObject
 import org.kethereum.crypto.SecureRandomUtils
 import org.kethereum.crypto.toECKeyPair
diff --git a/blockstack-sdk/src/test/java/org/blockstack/android/sdk/AddressesExtensionTest.kt b/blockstack-sdk/src/test/java/org/blockstack/android/sdk/AddressesExtensionTest.kt
new file mode 100644
index 00000000..9b18b7af
--- /dev/null
+++ b/blockstack-sdk/src/test/java/org/blockstack/android/sdk/AddressesExtensionTest.kt
@@ -0,0 +1,65 @@
+package org.blockstack.android.sdk
+
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
+import org.blockstack.android.sdk.extensions.*
+import org.blockstack.android.sdk.model.BlockstackIdentity
+import org.junit.Assert
+import org.junit.Test
+import org.kethereum.bip32.generateChildKey
+import org.kethereum.bip32.toKey
+import org.kethereum.bip39.model.MnemonicWords
+import org.kethereum.bip39.toSeed
+import org.kethereum.extensions.toHexStringNoPrefix
+import org.komputing.kbip44.BIP44Element
+
+class AddressesExtensionTest {
+
+    private val SEED_PHRASE =
+        "float myth tuna chuckle estate recipe canoe equal sport matter zebra vanish pyramid this veteran oppose festival lava economy uniform open zoo shrug fade"
+    private val PRIVATE_KEY =
+        "9f6da87aa7a214d484517394ca0689a38faa8b3497bb9bf491bd82c31b5af796" //01
+    private val PUBLIC_KEY = "023064b1fa3c279cd7c8eca2f41c3aa33dc48741819f38b740975af1e8fef61fe4"
+    private val BTC_ADDRESS_MAINNET = "1Hu5PUAGWqaokbusF7ZUTpfnejwKbAeGUd"
+    private val STX_ADDRESS_MAINNET = "SP2WNPKGHNM1PKE1D95KGADR1X5MWXTJHD8EJ1HHK"
+
+    // Test environment
+    private val STX_ADDRESS_TESTNET = "ST2WNPKGHNM1PKE1D95KGADR1X5MWXTJHDAYBBZPG"
+
+    @Test
+    fun stxAddressMainnetTest() = runBlocking {
+        // Arrange
+        val keys = generateWalletKeysFromMnemonicWords(SEED_PHRASE)
+
+        // Act / Assert
+        Assert.assertEquals(PUBLIC_KEY, keys.keyPair.toHexPublicKey64())
+        Assert.assertEquals(PRIVATE_KEY, keys.keyPair.privateKey.key.toHexStringNoPrefix())
+        Assert.assertEquals(BTC_ADDRESS_MAINNET, keys.keyPair.toBtcAddress())
+        Assert.assertEquals(STX_ADDRESS_MAINNET, "S${keys.keyPair.toStxAddress()}")
+    }
+
+    @Test
+    fun stxAddressTestnetTest() = runBlocking {
+        // Arrange
+        val keys = generateWalletKeysFromMnemonicWords(SEED_PHRASE)
+
+        // Act Assert
+        Assert.assertEquals(STX_ADDRESS_TESTNET, "S${keys.keyPair.toTestNetStxAddress()}")
+    }
+
+    @Test
+    fun crockford32Test() {
+        val encoded = "something very very big and complex".encodeCrockford32()
+        Assert.assertEquals("something very very big and complex", encoded.decodeCrockford32())
+    }
+
+
+    private suspend fun generateWalletKeysFromMnemonicWords(seedPhrase: String) = withContext(
+        Dispatchers.IO
+    ) {
+        val words = MnemonicWords(seedPhrase)
+        val stxKeys = BlockstackIdentity(words.toSeed().toKey("m/44'/5757'/0'/0"))
+        return@withContext stxKeys.identityKeys.generateChildKey(BIP44Element(false, 0))
+    }
+}
\ No newline at end of file
diff --git a/blockstack-sdk/src/test/java/org/blockstack/android/sdk/SignatureTest.kt b/blockstack-sdk/src/test/java/org/blockstack/android/sdk/SignatureTest.kt
index 21cb4bc5..f8dff9ee 100644
--- a/blockstack-sdk/src/test/java/org/blockstack/android/sdk/SignatureTest.kt
+++ b/blockstack-sdk/src/test/java/org/blockstack/android/sdk/SignatureTest.kt
@@ -6,6 +6,7 @@ import org.blockstack.android.sdk.ecies.fromDER
 import org.blockstack.android.sdk.ecies.signContent
 import org.blockstack.android.sdk.ecies.toDER
 import org.blockstack.android.sdk.ecies.verify
+import org.blockstack.android.sdk.extensions.toHexPublicKey64
 import org.hamcrest.CoreMatchers.`is`
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
diff --git a/build.gradle b/build.gradle
index c988ead7..229a8992 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
     ext {
         kotlin_version = '1.4.10'
         khex_version = '1.0.0'
-        khash_version = ' 1.0.0-RC5'
+        khash_version = '1.1.1'
         kethereum_version = '0.83.0'
         did_jwt_version = '0.4.0'
         kbase58_version = '0.1'
@@ -13,7 +13,7 @@ buildscript {
 
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -33,7 +33,7 @@ plugins {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         maven { url 'https://jitpack.io' }
     }
 }

From 907ae0eca0faf7b5421943cc87165dd88dfa275c Mon Sep 17 00:00:00 2001
From: FilipeA <filiperamosalves@gmail.com>
Date: Fri, 16 Jul 2021 15:14:27 +0100
Subject: [PATCH 02/13] added: Crockford32Tests

---
 .../blockstack/android/sdk/Crockford32Test.kt | 73 +++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 blockstack-sdk/src/test/java/org/blockstack/android/sdk/Crockford32Test.kt

diff --git a/blockstack-sdk/src/test/java/org/blockstack/android/sdk/Crockford32Test.kt b/blockstack-sdk/src/test/java/org/blockstack/android/sdk/Crockford32Test.kt
new file mode 100644
index 00000000..2e306c29
--- /dev/null
+++ b/blockstack-sdk/src/test/java/org/blockstack/android/sdk/Crockford32Test.kt
@@ -0,0 +1,73 @@
+package org.blockstack.android.sdk
+
+import org.blockstack.android.sdk.extensions.decodeCrockford32
+import org.blockstack.android.sdk.extensions.encodeCrockford32
+import org.junit.Assert
+import org.junit.Test
+
+class Crockford32Test {
+
+    val strings = listOf(
+        "a46ff88886c2ef9762d970b4d2c63678835bd39d",
+        "",
+        "0000000000000000000000000000000000000000",
+        "0000000000000000000000000000000000000001",
+        "1000000000000000000000000000000000000001",
+        "1000000000000000000000000000000000000000",
+        "1",
+        "22",
+        "001",
+        "0001",
+        "00001",
+        "000001",
+        "0000001",
+        "00000001",
+        "10",
+        "100",
+        "1000",
+        "10000",
+        "100000",
+        "1000000",
+        "10000000",
+        "100000000"
+    )
+
+    val c32Strings = listOf(
+        "C4T3CSK670W3GE1PCCS6ASHS6WV34S1S6WR64D3469HKCCSP6WW3GCSNC9J36EB4",
+        "",
+        "60R30C1G60R30C1G60R30C1G60R30C1G60R30C1G60R30C1G60R30C1G60R30C1G",
+        "60R30C1G60R30C1G60R30C1G60R30C1G60R30C1G60R30C1G60R30C1G60R30C1H",
+        "64R30C1G60R30C1G60R30C1G60R30C1G60R30C1G60R30C1G60R30C1G60R30C1H",
+        "64R30C1G60R30C1G60R30C1G60R30C1G60R30C1G60R30C1G60R30C1G60R30C1G",
+        "64",
+        "68S0",
+        "60R32",
+        "60R30C8",
+        "60R30C1H",
+        "60R30C1G64",
+        "60R30C1G60RG",
+        "60R30C1G60R32",
+        "64R0",
+        "64R30",
+        "64R30C0",
+        "64R30C1G",
+        "64R30C1G60",
+        "64R30C1G60R0",
+        "64R30C1G60R30",
+        "64R30C1G60R30C0"
+    )
+
+    @Test
+    fun encodeTest() {
+        strings.forEachIndexed { index, string ->
+            Assert.assertEquals(c32Strings[index], string.encodeCrockford32())
+        }
+    }
+
+    @Test
+    fun decodeTest() {
+        c32Strings.forEachIndexed { index, string ->
+            Assert.assertEquals(strings[index], string.decodeCrockford32())
+        }
+    }
+}
\ No newline at end of file

From 2fac76e722e4c31de145c4f08983d7df59665ed7 Mon Sep 17 00:00:00 2001
From: FilipeA <filiperamosalves@gmail.com>
Date: Wed, 21 Jul 2021 15:47:30 +0100
Subject: [PATCH 03/13] updated: bloco.io PR feedbacks (#3)

---
 .idea/runConfigurations.xml                      | 13 -------------
 .../android/sdk/EncryptionColendiKotlinTest.kt   |  2 +-
 .../blockstack/android/sdk/Crockford32Test.kt    |  6 ++++++
 .../AddressesTest.kt}                            | 16 +++++-----------
 4 files changed, 12 insertions(+), 25 deletions(-)
 delete mode 100644 .idea/runConfigurations.xml
 rename blockstack-sdk/src/test/java/org/blockstack/android/sdk/{AddressesExtensionTest.kt => extensions/AddressesTest.kt} (83%)

diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index e497da99..00000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/blockstack-sdk/src/androidTest/java/org/blockstack/android/sdk/EncryptionColendiKotlinTest.kt b/blockstack-sdk/src/androidTest/java/org/blockstack/android/sdk/EncryptionColendiKotlinTest.kt
index 1bb191f2..8fa94a42 100644
--- a/blockstack-sdk/src/androidTest/java/org/blockstack/android/sdk/EncryptionColendiKotlinTest.kt
+++ b/blockstack-sdk/src/androidTest/java/org/blockstack/android/sdk/EncryptionColendiKotlinTest.kt
@@ -20,7 +20,7 @@ class EncryptionColendiKotlinTest {
     val rule = ActivityTestRule(TestActivity::class.java)
 
     @Test
-    @Ignore("Test not passing on 0.6.2, no changes made here in 0.6.3 marked as ignored until fixes are made")
+    @Ignore("Test not passing on 0.6.2, no changes made here in 0.6.3, marked as ignored until fixes are made")
     fun testEncryptDecryptWorks() {
         val encryption = EncryptionColendi()
 
diff --git a/blockstack-sdk/src/test/java/org/blockstack/android/sdk/Crockford32Test.kt b/blockstack-sdk/src/test/java/org/blockstack/android/sdk/Crockford32Test.kt
index 2e306c29..9983d338 100644
--- a/blockstack-sdk/src/test/java/org/blockstack/android/sdk/Crockford32Test.kt
+++ b/blockstack-sdk/src/test/java/org/blockstack/android/sdk/Crockford32Test.kt
@@ -70,4 +70,10 @@ class Crockford32Test {
             Assert.assertEquals(strings[index], string.decodeCrockford32())
         }
     }
+
+    @Test
+    fun crockford32Test() {
+        val encoded = "something very very big and complex".encodeCrockford32()
+        Assert.assertEquals("something very very big and complex", encoded.decodeCrockford32())
+    }
 }
\ No newline at end of file
diff --git a/blockstack-sdk/src/test/java/org/blockstack/android/sdk/AddressesExtensionTest.kt b/blockstack-sdk/src/test/java/org/blockstack/android/sdk/extensions/AddressesTest.kt
similarity index 83%
rename from blockstack-sdk/src/test/java/org/blockstack/android/sdk/AddressesExtensionTest.kt
rename to blockstack-sdk/src/test/java/org/blockstack/android/sdk/extensions/AddressesTest.kt
index 9b18b7af..6aea3a5a 100644
--- a/blockstack-sdk/src/test/java/org/blockstack/android/sdk/AddressesExtensionTest.kt
+++ b/blockstack-sdk/src/test/java/org/blockstack/android/sdk/extensions/AddressesTest.kt
@@ -1,9 +1,8 @@
-package org.blockstack.android.sdk
+package org.blockstack.android.sdk.extensions
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
-import org.blockstack.android.sdk.extensions.*
 import org.blockstack.android.sdk.model.BlockstackIdentity
 import org.junit.Assert
 import org.junit.Test
@@ -14,13 +13,14 @@ import org.kethereum.bip39.toSeed
 import org.kethereum.extensions.toHexStringNoPrefix
 import org.komputing.kbip44.BIP44Element
 
-class AddressesExtensionTest {
+class AddressesTest {
 
     private val SEED_PHRASE =
         "float myth tuna chuckle estate recipe canoe equal sport matter zebra vanish pyramid this veteran oppose festival lava economy uniform open zoo shrug fade"
     private val PRIVATE_KEY =
         "9f6da87aa7a214d484517394ca0689a38faa8b3497bb9bf491bd82c31b5af796" //01
-    private val PUBLIC_KEY = "023064b1fa3c279cd7c8eca2f41c3aa33dc48741819f38b740975af1e8fef61fe4"
+    private val PUBLIC_KEY =
+        "023064b1fa3c279cd7c8eca2f41c3aa33dc48741819f38b740975af1e8fef61fe4"
     private val BTC_ADDRESS_MAINNET = "1Hu5PUAGWqaokbusF7ZUTpfnejwKbAeGUd"
     private val STX_ADDRESS_MAINNET = "SP2WNPKGHNM1PKE1D95KGADR1X5MWXTJHD8EJ1HHK"
 
@@ -48,12 +48,6 @@ class AddressesExtensionTest {
         Assert.assertEquals(STX_ADDRESS_TESTNET, "S${keys.keyPair.toTestNetStxAddress()}")
     }
 
-    @Test
-    fun crockford32Test() {
-        val encoded = "something very very big and complex".encodeCrockford32()
-        Assert.assertEquals("something very very big and complex", encoded.decodeCrockford32())
-    }
-
 
     private suspend fun generateWalletKeysFromMnemonicWords(seedPhrase: String) = withContext(
         Dispatchers.IO
@@ -62,4 +56,4 @@ class AddressesExtensionTest {
         val stxKeys = BlockstackIdentity(words.toSeed().toKey("m/44'/5757'/0'/0"))
         return@withContext stxKeys.identityKeys.generateChildKey(BIP44Element(false, 0))
     }
-}
\ No newline at end of file
+}

From f4a9df5f413b1d16f57863149b472000eba27272 Mon Sep 17 00:00:00 2001
From: FilipeA <filiperamosalves@gmail.com>
Date: Fri, 16 Jul 2021 17:36:50 +0100
Subject: [PATCH 04/13] updated: Core Url (https://stacks-node-api.stacks.co)

---
 CHANGELOG.md                                  |  4 ++
 blockstack-sdk/build.gradle                   |  2 +-
 .../org/blockstack/android/sdk/Blockstack.kt  | 40 ++++++++++++++-----
 .../android/sdk/BlockstackSession.kt          |  5 ++-
 .../java/org/blockstack/android/sdk/DIDs.kt   |  6 +--
 .../org/blockstack/android/sdk/Defaults.kt    |  2 +-
 .../android/sdk/extensions/Addresses.kt       | 20 ++++++++--
 .../android/sdk/extensions/AddressesTest.kt   |  2 +
 .../org/blockstack/android/MainActivity.kt    |  6 ++-
 9 files changed, 63 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a84caa1a..1bc71af5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unrelease
 
+## [0.6.4] - 2021-07-16
+### Changed
+- Default Core API endpoint (https://stacks-node-api.stacks.co)
+
 ## [0.6.3] - 2021-07-01
 ### Added
 - ability to generate Stacks Addresses
diff --git a/blockstack-sdk/build.gradle b/blockstack-sdk/build.gradle
index a01cb768..223ca2bc 100644
--- a/blockstack-sdk/build.gradle
+++ b/blockstack-sdk/build.gradle
@@ -12,7 +12,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 30
         versionCode 2
-        versionName "0.6.3"
+        versionName "0.6.4"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/Blockstack.kt b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/Blockstack.kt
index e267b781..05bcd5b3 100644
--- a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/Blockstack.kt
+++ b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/Blockstack.kt
@@ -22,6 +22,7 @@ import okhttp3.Request
 import okhttp3.Response
 import org.blockstack.android.sdk.extensions.toBtcAddress
 import org.blockstack.android.sdk.extensions.toHexPublicKey64
+import org.blockstack.android.sdk.extensions.toStxAddress
 import org.blockstack.android.sdk.model.*
 import org.json.JSONArray
 import org.json.JSONException
@@ -98,8 +99,8 @@ class Blockstack(private val callFactory: Call.Factory = OkHttpClient(),
                     ""
                 },
                 "profile_url" to null,
-                "hubUrl" to "https://hub.blockstack.org",
-                "blockstackAPIUrl" to "https://core.blockstack.org",
+                "hubUrl" to "https://hub.blockstack.org", //TODO: here is what?
+                "blockstackAPIUrl" to "https://core.blockstack.org", //TODO: here is what?
                 "associationToken" to null,
                 "version" to VERSION
         )
@@ -296,8 +297,21 @@ class Blockstack(private val callFactory: Call.Factory = OkHttpClient(),
             val body = response.body!!.string()
             val nameInfo = JSONObject(body)
             val nameOwningAddress = nameInfo.optString("address")
-            val addressFromIssuer = DIDs.getAddressFromDID(payload.optString("iss"))
-            return nameOwningAddress.isNotEmpty() && nameOwningAddress == addressFromIssuer
+            val addressFromIssuer = DIDs.getAddressFromDID(payload.optString("iss")) ?: ""
+
+            //Check if the address is a stx address
+            return if (nameOwningAddress.startsWith("S")) {
+                if (nameOwningAddress.isNotEmpty() && nameOwningAddress == addressFromIssuer) {
+                    true
+                } else {
+                    // Backward Compatibility (Address STX with BTC issuer)
+                    // if the address is not the same, check if the profile belongs to the owner
+                    nameInfo.optString("zonefile").contains(addressFromIssuer)
+                }
+            } else {
+                // legacy
+                nameOwningAddress.isNotEmpty() && nameOwningAddress == addressFromIssuer
+            }
         } else {
             return false
         }
@@ -519,17 +533,21 @@ class Blockstack(private val callFactory: Call.Factory = OkHttpClient(),
         }
 
         val issuerPublicKey = payload.getJSONObject("issuer").getString("publicKey")
-        val uncompressedAddress = issuerPublicKey.toBtcAddress()
+        val uncompressedBtcAddress = issuerPublicKey.toBtcAddress()
+        val uncompressedStxAddress = issuerPublicKey.toStxAddress(true)
 
-        if (publicKeyOrAddress == issuerPublicKey) {
-            // pass
-        } else {
-            if (publicKeyOrAddress == uncompressedAddress) {
+            if (publicKeyOrAddress == issuerPublicKey) {
                 // pass
             } else {
-                throw Error("Token issuer public key does not match the verifying value")
+                when (publicKeyOrAddress) {
+                    uncompressedBtcAddress -> { /* Pass */}
+                    uncompressedStxAddress -> { /* Pass */}
+                    else -> {
+                        throw Error("Token issuer public key does not match the verifying value")
+                    }
+                }
             }
-        }
+
 
         return ProfileToken(tokenTripleToJSON(decodedToken))
 
diff --git a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackSession.kt b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackSession.kt
index 517cd7c6..62e53ae2 100644
--- a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackSession.kt
+++ b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackSession.kt
@@ -60,7 +60,7 @@ class BlockstackSession(private val sessionStore: ISessionStore, private val app
      */
     suspend fun handlePendingSignIn(authResponse: String): Result<out UserData> = withContext(dispatcher) {
         val transitKey = sessionStore.getTransitPrivateKey()
-        val nameLookupUrl = sessionStore.sessionData.json.optString("core-node", "https://core.blockstack.org")
+        val nameLookupUrl = sessionStore.sessionData.json.optString("core-node", "stacks-node-api.stacks.co")
 
         val tokenTriple = try {
             blockstack.decodeToken(authResponse)
@@ -92,7 +92,8 @@ class BlockstackSession(private val sessionStore: ISessionStore, private val app
     }
 
     suspend fun handleUnencryptedSignIn(authResponse: String): Result<UserData> {
-        val nameLookupUrl = sessionStore.sessionData.json.optString("core-node", "https://core.blockstack.org")
+        //TODO: change here
+        val nameLookupUrl = sessionStore.sessionData.json.optString("core-node", "stacks-node-api.stacks.co")
 
         val tokenTriple = blockstack.decodeToken(authResponse)
         val tokenPayload = tokenTriple.second
diff --git a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/DIDs.kt b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/DIDs.kt
index 70c04891..105c9563 100644
--- a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/DIDs.kt
+++ b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/DIDs.kt
@@ -2,8 +2,6 @@ package org.blockstack.android.sdk
 
 import me.uport.sdk.universaldid.*
 import okhttp3.Call
-import okhttp3.Request
-import org.json.JSONObject
 import java.util.*
 
 class DIDs {
@@ -19,8 +17,10 @@ class DIDs {
 
             if (didType == "btc-addr") {
                 return did.split(':')[2]
+            }else if (didType == "stx-addr") {
+                return did.split(':')[2]
             } else {
-                return null
+                return  null
             }
         }
 
diff --git a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/Defaults.kt b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/Defaults.kt
index 770930e3..18aa9e81 100644
--- a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/Defaults.kt
+++ b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/Defaults.kt
@@ -1,7 +1,7 @@
 package org.blockstack.android.sdk
 
 const val BLOCKSTACK_DEFAULT_GAIA_HUB_URL = "https://hub.blockstack.org"
-const val DEFAULT_CORE_API_ENDPOINT = "https://core.blockstack.org"
+const val DEFAULT_CORE_API_ENDPOINT = "https://stacks-node-api.stacks.co"
 const val DEFAULT_BLOCKSTACK_ID_HOST = "https://app.blockstack.org"
 const val LEGACY_BLOCKSTACK_ID_HOST = "https://browser.blockstack.org/auth"
 const val VERSION = "1.3.1"
diff --git a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/extensions/Addresses.kt b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/extensions/Addresses.kt
index b54a9582..a860e624 100644
--- a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/extensions/Addresses.kt
+++ b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/extensions/Addresses.kt
@@ -15,20 +15,32 @@ fun ECKeyPair.toHexPublicKey64(): String {
     return this.getCompressedPublicKey().toNoPrefixHexString()
 }
 
-fun ECKeyPair.toStxAddress(): String {
+fun String.toStxAddress(sPrefix: Boolean = false): String {
+    val sha256 = hexToByteArray().sha256()
+    val hash160 = sha256.digestRipemd160()
+    val extended = "b0${hash160.toNoPrefixHexString()}"
+    val cs = checksum("16${hash160.toNoPrefixHexString()}")
+
+    val prefix = if(sPrefix) "S" else ""
+    return prefix + (extended + cs).hexToByteArray().encodeCrockford32()
+}
+
+fun ECKeyPair.toStxAddress(sPrefix: Boolean = false): String {
     val sha256 = toHexPublicKey64().hexToByteArray().sha256()
     val hash160 = sha256.digestRipemd160()
     val extended = "b0${hash160.toNoPrefixHexString()}"
     val cs = checksum("16${hash160.toNoPrefixHexString()}")
-    return (extended + cs).hexToByteArray().encodeCrockford32()
+    val prefix = if(sPrefix) "S" else ""
+    return prefix + (extended + cs).hexToByteArray().encodeCrockford32()
 }
 
-fun ECKeyPair.toTestNetStxAddress() : String {
+fun ECKeyPair.toTestNetStxAddress(sPrefix: Boolean = false) : String {
     val sha256 = toHexPublicKey64().hexToByteArray().sha256()
     val hash160 = sha256.digestRipemd160()
     val extended = "d0${hash160.toNoPrefixHexString()}"
     val cs = checksum("1a${hash160.toNoPrefixHexString()}")
-    return (extended + cs).hexToByteArray().encodeCrockford32()
+    val prefix = if(sPrefix) "S" else ""
+    return prefix + (extended + cs).hexToByteArray().encodeCrockford32()
 }
 
 fun String.toBtcAddress(): String {
diff --git a/blockstack-sdk/src/test/java/org/blockstack/android/sdk/extensions/AddressesTest.kt b/blockstack-sdk/src/test/java/org/blockstack/android/sdk/extensions/AddressesTest.kt
index 6aea3a5a..7656ad83 100644
--- a/blockstack-sdk/src/test/java/org/blockstack/android/sdk/extensions/AddressesTest.kt
+++ b/blockstack-sdk/src/test/java/org/blockstack/android/sdk/extensions/AddressesTest.kt
@@ -37,6 +37,7 @@ class AddressesTest {
         Assert.assertEquals(PRIVATE_KEY, keys.keyPair.privateKey.key.toHexStringNoPrefix())
         Assert.assertEquals(BTC_ADDRESS_MAINNET, keys.keyPair.toBtcAddress())
         Assert.assertEquals(STX_ADDRESS_MAINNET, "S${keys.keyPair.toStxAddress()}")
+        Assert.assertEquals(STX_ADDRESS_MAINNET, keys.keyPair.toStxAddress(true))
     }
 
     @Test
@@ -46,6 +47,7 @@ class AddressesTest {
 
         // Act Assert
         Assert.assertEquals(STX_ADDRESS_TESTNET, "S${keys.keyPair.toTestNetStxAddress()}")
+        Assert.assertEquals(STX_ADDRESS_TESTNET, keys.keyPair.toTestNetStxAddress(true))
     }
 
 
diff --git a/example/src/main/java/org/blockstack/android/MainActivity.kt b/example/src/main/java/org/blockstack/android/MainActivity.kt
index 47c3efd6..3f1887c6 100644
--- a/example/src/main/java/org/blockstack/android/MainActivity.kt
+++ b/example/src/main/java/org/blockstack/android/MainActivity.kt
@@ -57,6 +57,7 @@ class MainActivity : AppCompatActivity() {
         blockstack = Blockstack()
         _blockstackSession = BlockstackSession(sessionStore, config, blockstack = blockstack)
         blockstackSignIn = BlockstackSignIn(sessionStore, config, appDetails)
+        //TODO: change here
         network = Network("https://core.blockstack.org")
         signInButton.isEnabled = true
         getUserAppFileUrlButton.isEnabled = true
@@ -186,8 +187,8 @@ class MainActivity : AppCompatActivity() {
         }
 
         getStringFileFromUserButton.setOnClickListener {
-
-            val zoneFileLookupUrl = URL("https://core.blockstack.org/v1/names")
+            //TODO: change here
+            val zoneFileLookupUrl = URL("https://stacks-node-api.stacks.co/v1/names")
             fileFromUserContentsTextView.text = "Downloading file from other user..."
             lifecycleScope.launch {
                 val profile = blockstack.lookupProfile(username, zoneFileLookupURL = zoneFileLookupUrl)
@@ -225,6 +226,7 @@ class MainActivity : AppCompatActivity() {
 
         getUserAppFileUrlButton.setOnClickListener { _ ->
             getUserAppFileUrlText.text = "Getting url ..."
+            //TODO: change here
             val zoneFileLookupUrl = "https://core.blockstack.org/v1/names"
             lifecycleScope.launch {
                 val it = blockstack.getUserAppFileUrl(textFileName, username, "https://flamboyant-darwin-d11c17.netlify.app", zoneFileLookupUrl)

From 567fb9f5715ba1fc4dbead6dcc6d8d48ad7edf55 Mon Sep 17 00:00:00 2001
From: FilipeA <filiperamosalves@gmail.com>
Date: Wed, 21 Jul 2021 16:11:58 +0100
Subject: [PATCH 05/13] updated: bloco.io PR feedbacks (#4)

---
 .../org/blockstack/android/sdk/Blockstack.kt  | 22 ++++++-------------
 .../android/sdk/BlockstackSession.kt          |  7 ++++--
 .../java/org/blockstack/android/sdk/DIDs.kt   |  2 +-
 .../org/blockstack/android/MainActivity.kt    |  4 +---
 4 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/Blockstack.kt b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/Blockstack.kt
index 05bcd5b3..1f8eba17 100644
--- a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/Blockstack.kt
+++ b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/Blockstack.kt
@@ -99,8 +99,8 @@ class Blockstack(private val callFactory: Call.Factory = OkHttpClient(),
                     ""
                 },
                 "profile_url" to null,
-                "hubUrl" to "https://hub.blockstack.org", //TODO: here is what?
-                "blockstackAPIUrl" to "https://core.blockstack.org", //TODO: here is what?
+                "hubUrl" to "https://hub.blockstack.org",
+                "blockstackAPIUrl" to DEFAULT_CORE_API_ENDPOINT,
                 "associationToken" to null,
                 "version" to VERSION
         )
@@ -536,21 +536,13 @@ class Blockstack(private val callFactory: Call.Factory = OkHttpClient(),
         val uncompressedBtcAddress = issuerPublicKey.toBtcAddress()
         val uncompressedStxAddress = issuerPublicKey.toStxAddress(true)
 
-            if (publicKeyOrAddress == issuerPublicKey) {
-                // pass
-            } else {
-                when (publicKeyOrAddress) {
-                    uncompressedBtcAddress -> { /* Pass */}
-                    uncompressedStxAddress -> { /* Pass */}
-                    else -> {
-                        throw Error("Token issuer public key does not match the verifying value")
-                    }
-                }
-            }
-
+        if (publicKeyOrAddress == issuerPublicKey) {
+            // pass
+        } else if (publicKeyOrAddress != uncompressedBtcAddress && publicKeyOrAddress != uncompressedStxAddress) {
+            throw Error("Token issuer public key does not match the verifying value")
+        }
 
         return ProfileToken(tokenTripleToJSON(decodedToken))
-
     }
 
     private fun tokenTripleToJSON(decodedToken: Triple<JwtHeader, JSONObject, ByteArray>): JSONObject {
diff --git a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackSession.kt b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackSession.kt
index 62e53ae2..318c090f 100644
--- a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackSession.kt
+++ b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackSession.kt
@@ -92,8 +92,11 @@ class BlockstackSession(private val sessionStore: ISessionStore, private val app
     }
 
     suspend fun handleUnencryptedSignIn(authResponse: String): Result<UserData> {
-        //TODO: change here
-        val nameLookupUrl = sessionStore.sessionData.json.optString("core-node", "stacks-node-api.stacks.co")
+
+        val nameLookupUrl = sessionStore.sessionData.json.optString(
+            "core-node",
+            DEFAULT_CORE_API_ENDPOINT.replace("https://", "")
+        )
 
         val tokenTriple = blockstack.decodeToken(authResponse)
         val tokenPayload = tokenTriple.second
diff --git a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/DIDs.kt b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/DIDs.kt
index 105c9563..349c68b0 100644
--- a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/DIDs.kt
+++ b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/DIDs.kt
@@ -20,7 +20,7 @@ class DIDs {
             }else if (didType == "stx-addr") {
                 return did.split(':')[2]
             } else {
-                return  null
+                return null
             }
         }
 
diff --git a/example/src/main/java/org/blockstack/android/MainActivity.kt b/example/src/main/java/org/blockstack/android/MainActivity.kt
index 3f1887c6..9deaaabc 100644
--- a/example/src/main/java/org/blockstack/android/MainActivity.kt
+++ b/example/src/main/java/org/blockstack/android/MainActivity.kt
@@ -187,7 +187,6 @@ class MainActivity : AppCompatActivity() {
         }
 
         getStringFileFromUserButton.setOnClickListener {
-            //TODO: change here
             val zoneFileLookupUrl = URL("https://stacks-node-api.stacks.co/v1/names")
             fileFromUserContentsTextView.text = "Downloading file from other user..."
             lifecycleScope.launch {
@@ -226,8 +225,7 @@ class MainActivity : AppCompatActivity() {
 
         getUserAppFileUrlButton.setOnClickListener { _ ->
             getUserAppFileUrlText.text = "Getting url ..."
-            //TODO: change here
-            val zoneFileLookupUrl = "https://core.blockstack.org/v1/names"
+            val zoneFileLookupUrl = DEFAULT_CORE_API_ENDPOINT + "v1/names"
             lifecycleScope.launch {
                 val it = blockstack.getUserAppFileUrl(textFileName, username, "https://flamboyant-darwin-d11c17.netlify.app", zoneFileLookupUrl)
                 withContext(Dispatchers.Main) {

From 2584226c88dd61c4a7d9328caa36d8f2f5a0951d Mon Sep 17 00:00:00 2001
From: FilipeA <filiperamosalves@gmail.com>
Date: Wed, 21 Jul 2021 16:39:54 +0100
Subject: [PATCH 06/13] updated: removed todo: (new api does not have all
 methods, and some response types are different even in the V1 version)

---
 example/src/main/java/org/blockstack/android/MainActivity.kt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/example/src/main/java/org/blockstack/android/MainActivity.kt b/example/src/main/java/org/blockstack/android/MainActivity.kt
index 9deaaabc..57081e85 100644
--- a/example/src/main/java/org/blockstack/android/MainActivity.kt
+++ b/example/src/main/java/org/blockstack/android/MainActivity.kt
@@ -57,7 +57,6 @@ class MainActivity : AppCompatActivity() {
         blockstack = Blockstack()
         _blockstackSession = BlockstackSession(sessionStore, config, blockstack = blockstack)
         blockstackSignIn = BlockstackSignIn(sessionStore, config, appDetails)
-        //TODO: change here
         network = Network("https://core.blockstack.org")
         signInButton.isEnabled = true
         getUserAppFileUrlButton.isEnabled = true

From 4af4ddfff011a167f7252c949668e6bf4e630ca5 Mon Sep 17 00:00:00 2001
From: FilipeA <filiperamosalves@gmail.com>
Date: Wed, 18 Aug 2021 15:35:52 +0100
Subject: [PATCH 07/13] added: better null safety for association token

---
 .../org/blockstack/android/sdk/Blockstack.kt  |  2 +-
 .../android/sdk/BlockstackSession.kt          | 16 +++++--
 .../android/sdk/extensions/Addresses.kt       |  2 +
 .../android/sdk/extensions/JSONObject.kt      | 12 +++++
 .../android/sdk/extensions/AddressesTest.kt   | 38 +++++++++++++---
 .../sdk/extensions/JSONObjectKtTest.kt        | 44 +++++++++++++++++++
 6 files changed, 102 insertions(+), 12 deletions(-)
 create mode 100644 blockstack-sdk/src/main/java/org/blockstack/android/sdk/extensions/JSONObject.kt
 create mode 100644 blockstack-sdk/src/test/java/org/blockstack/android/sdk/extensions/JSONObjectKtTest.kt

diff --git a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/Blockstack.kt b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/Blockstack.kt
index 1f8eba17..1a7f31bc 100644
--- a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/Blockstack.kt
+++ b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/Blockstack.kt
@@ -100,7 +100,7 @@ class Blockstack(private val callFactory: Call.Factory = OkHttpClient(),
                 },
                 "profile_url" to null,
                 "hubUrl" to "https://hub.blockstack.org",
-                "blockstackAPIUrl" to DEFAULT_CORE_API_ENDPOINT,
+                "blockstackAPIUrl" to "https://core.blockstack.org",
                 "associationToken" to null,
                 "version" to VERSION
         )
diff --git a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackSession.kt b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackSession.kt
index 318c090f..ca3738e6 100644
--- a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackSession.kt
+++ b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackSession.kt
@@ -17,6 +17,7 @@ import okio.ByteString.Companion.toByteString
 import org.blockstack.android.sdk.ecies.signContent
 import org.blockstack.android.sdk.ecies.signEncryptedContent
 import org.blockstack.android.sdk.ecies.verify
+import org.blockstack.android.sdk.extensions.getStringOrNull
 import org.blockstack.android.sdk.extensions.toBtcAddress
 import org.blockstack.android.sdk.extensions.toHexPublicKey64
 import org.blockstack.android.sdk.model.*
@@ -117,11 +118,18 @@ class BlockstackSession(private val sessionStore: ISessionStore, private val app
     }
 
 
-    suspend fun authResponseToUserData(tokenPayload: JSONObject, nameLookupUrl: String, appPrivateKey: String?, coreSessionToken: String?, authResponse: String): UserData {
+    suspend fun authResponseToUserData(
+        tokenPayload: JSONObject,
+        nameLookupUrl: String,
+        appPrivateKey: String?,
+        coreSessionToken: String?,
+        authResponse: String
+    ): UserData {
         val iss = tokenPayload.getString("iss")
 
         val identityAddress = DIDs.getAddressFromDID(iss)
-        val userData = UserData(JSONObject()
+        return UserData(
+            JSONObject()
                 .put("username", tokenPayload.getString("username"))
                 .put("profile", extractProfile(tokenPayload, nameLookupUrl))
                 .put("email", tokenPayload.optString("email"))
@@ -131,8 +139,8 @@ class BlockstackSession(private val sessionStore: ISessionStore, private val app
                 .put("coreSessionToken", coreSessionToken)
                 .put("authResponseToken", authResponse)
                 .put("hubUrl", tokenPayload.optString("hubUrl", BLOCKSTACK_DEFAULT_GAIA_HUB_URL))
-                .put("gaiaAssociationToken", tokenPayload.optString("associationToken")))
-        return userData
+                .put("gaiaAssociationToken", tokenPayload.getStringOrNull("associationToken"))
+        )
     }
 
 
diff --git a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/extensions/Addresses.kt b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/extensions/Addresses.kt
index a860e624..1f9071d6 100644
--- a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/extensions/Addresses.kt
+++ b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/extensions/Addresses.kt
@@ -32,6 +32,8 @@ fun ECKeyPair.toStxAddress(sPrefix: Boolean = false): String {
     val cs = checksum("16${hash160.toNoPrefixHexString()}")
     val prefix = if(sPrefix) "S" else ""
     return prefix + (extended + cs).hexToByteArray().encodeCrockford32()
+    // current       b0 3c8045956db97437913676c6adc770e0ccb927fc 2b371f2d
+    // should be    cd bc8045956db97437913676c6adc770e0ccb927fc 2b371f2d
 }
 
 fun ECKeyPair.toTestNetStxAddress(sPrefix: Boolean = false) : String {
diff --git a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/extensions/JSONObject.kt b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/extensions/JSONObject.kt
new file mode 100644
index 00000000..89893090
--- /dev/null
+++ b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/extensions/JSONObject.kt
@@ -0,0 +1,12 @@
+package org.blockstack.android.sdk.extensions
+
+import org.json.JSONObject
+import java.util.*
+
+fun JSONObject.getStringOrNull(key: String): String? {
+    return if(!isNull(key) && optString(key).toUpperCase(Locale.getDefault()) != "NULL") {
+        optString(key)
+    } else {
+        null
+    }
+}
\ No newline at end of file
diff --git a/blockstack-sdk/src/test/java/org/blockstack/android/sdk/extensions/AddressesTest.kt b/blockstack-sdk/src/test/java/org/blockstack/android/sdk/extensions/AddressesTest.kt
index 7656ad83..f5533f53 100644
--- a/blockstack-sdk/src/test/java/org/blockstack/android/sdk/extensions/AddressesTest.kt
+++ b/blockstack-sdk/src/test/java/org/blockstack/android/sdk/extensions/AddressesTest.kt
@@ -12,6 +12,8 @@ import org.kethereum.bip39.model.MnemonicWords
 import org.kethereum.bip39.toSeed
 import org.kethereum.extensions.toHexStringNoPrefix
 import org.komputing.kbip44.BIP44Element
+import org.komputing.khex.extensions.toHexString
+import org.komputing.khex.extensions.toNoPrefixHexString
 
 class AddressesTest {
 
@@ -27,6 +29,18 @@ class AddressesTest {
     // Test environment
     private val STX_ADDRESS_TESTNET = "ST2WNPKGHNM1PKE1D95KGADR1X5MWXTJHDAYBBZPG"
 
+    @Test
+    fun customStxTest() = runBlocking {
+        val keys = generateLegacyWalletKeysFromMnemonicWords(SEED_PHRASE).keyPair
+
+        Assert.assertEquals("SPY80HCNDPWQ8DWH6SVCDBE7E3GCSE97ZGNKE7SD", keys.toStxAddress(true))
+    }
+
+    @Test
+    fun customDecode(): Unit = runBlocking {
+       "SPY80HCNDPWQ8DWH6SVCDBE7E3GCSE97ZGNKE7SD".decodeCrockford32ToByteArray().toNoPrefixHexString()
+    }
+
     @Test
     fun stxAddressMainnetTest() = runBlocking {
         // Arrange
@@ -40,6 +54,7 @@ class AddressesTest {
         Assert.assertEquals(STX_ADDRESS_MAINNET, keys.keyPair.toStxAddress(true))
     }
 
+
     @Test
     fun stxAddressTestnetTest() = runBlocking {
         // Arrange
@@ -50,12 +65,21 @@ class AddressesTest {
         Assert.assertEquals(STX_ADDRESS_TESTNET, keys.keyPair.toTestNetStxAddress(true))
     }
 
+}
 
-    private suspend fun generateWalletKeysFromMnemonicWords(seedPhrase: String) = withContext(
-        Dispatchers.IO
-    ) {
-        val words = MnemonicWords(seedPhrase)
-        val stxKeys = BlockstackIdentity(words.toSeed().toKey("m/44'/5757'/0'/0"))
-        return@withContext stxKeys.identityKeys.generateChildKey(BIP44Element(false, 0))
-    }
+
+private suspend fun generateWalletKeysFromMnemonicWords(seedPhrase: String) = withContext(
+    Dispatchers.IO
+) {
+    val words = MnemonicWords(seedPhrase)
+    val stxKeys = BlockstackIdentity(words.toSeed().toKey("m/44'/5757'/0'/0"))
+    return@withContext stxKeys.identityKeys.generateChildKey(BIP44Element(false, 0))
+}
+
+private suspend fun generateLegacyWalletKeysFromMnemonicWords(seedPhrase: String) = withContext(
+    Dispatchers.IO
+) {
+    val words = MnemonicWords("spray forum chronic innocent exercise market ice pact foster twice glory account")
+    val stxKeys = BlockstackIdentity(words.toSeed().toKey("m/888'/0'"))
+    return@withContext stxKeys.identityKeys.generateChildKey(BIP44Element(false, 0))
 }
diff --git a/blockstack-sdk/src/test/java/org/blockstack/android/sdk/extensions/JSONObjectKtTest.kt b/blockstack-sdk/src/test/java/org/blockstack/android/sdk/extensions/JSONObjectKtTest.kt
new file mode 100644
index 00000000..4be557f7
--- /dev/null
+++ b/blockstack-sdk/src/test/java/org/blockstack/android/sdk/extensions/JSONObjectKtTest.kt
@@ -0,0 +1,44 @@
+package org.blockstack.android.sdk.extensions
+
+import org.json.JSONObject
+import org.junit.Test
+
+
+class JSONObjectKtTest {
+
+    @Test
+    fun testGetNullableNull() {
+        // Arrange
+        val json = JSONObject("{\"associationToken\":null,\"version\":\"1.3.1\",\"iss\":\"did:btc-addr:1KjvynGKa7tuZyH4JVNKjBxkfXugk9wyhL\"}")
+
+        // Act
+        val token = json.getStringOrNull("associationToken")
+
+        // Assert
+        assert(token == null)
+    }
+
+    @Test
+    fun testGetNullableStringNull() {
+        // Arrange
+        val json = JSONObject("{\"associationToken\":\"null\",\"version\":\"1.3.1\",\"iss\":\"did:btc-addr:1KjvynGKa7tuZyH4JVNKjBxkfXugk9wyhL\"}")
+
+        // Act
+        val token = json.getStringOrNull("associationToken")
+
+        // Assert
+        assert(token == null)
+    }
+
+    @Test
+    fun testGetNullableValue() {
+        // Arrange
+        val json = JSONObject("{\"associationToken\":\"123\",\"version\":\"1.3.1\",\"iss\":\"did:btc-addr:1KjvynGKa7tuZyH4JVNKjBxkfXugk9wyhL\"}")
+
+        // Act
+        val token = json.getStringOrNull("associationToken")
+
+        // Assert
+        assert(token == "123")
+    }
+}
\ No newline at end of file

From 1b650f15bdc783a0492369ef7a68f6e42b10aa69 Mon Sep 17 00:00:00 2001
From: FilipeA <filiperamosalves@gmail.com>
Date: Mon, 23 Aug 2021 15:06:20 +0100
Subject: [PATCH 08/13] added: ability to use the flag registerSubdomain when
 signin

---
 CHANGELOG.md                                  |   4 +
 blockstack-sdk/build.gradle                   |   8 +-
 .../android/sdk/BlockstackConnect.kt          |   9 +-
 .../android/sdk/BlockstackSignIn.kt           | 113 +++++++++++++-----
 .../org/blockstack/android/sdk/Defaults.kt    |   1 +
 5 files changed, 97 insertions(+), 38 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1bc71af5..ff8f2513 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unrelease
 
+## [0.6.4] - 2021-07-16
+### Added
+- Ability to use the flag Register Subdomain when signIn
+
 ## [0.6.4] - 2021-07-16
 ### Changed
 - Default Core API endpoint (https://stacks-node-api.stacks.co)
diff --git a/blockstack-sdk/build.gradle b/blockstack-sdk/build.gradle
index 223ca2bc..86b6e85a 100644
--- a/blockstack-sdk/build.gradle
+++ b/blockstack-sdk/build.gradle
@@ -6,13 +6,13 @@ apply plugin: 'org.jetbrains.dokka-android'
 group = 'com.github.blockstack'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 30
-        versionCode 2
-        versionName "0.6.4"
+        targetSdkVersion 31
+        versionCode 6
+        versionName "0.6.5"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackConnect.kt b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackConnect.kt
index dd911889..cbe1c09f 100644
--- a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackConnect.kt
+++ b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackConnect.kt
@@ -5,11 +5,12 @@ import android.content.Intent
 import android.util.Log
 import androidx.annotation.StyleRes
 import androidx.appcompat.app.AppCompatActivity
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import org.blockstack.android.sdk.model.BlockstackConfig
 import org.blockstack.android.sdk.model.UserData
 import org.blockstack.android.sdk.ui.BlockstackConnectActivity
-import java.lang.Exception
 
 object BlockstackConnect {
 
@@ -83,13 +84,13 @@ object BlockstackConnect {
                 ErrorCode.UnknownError,
                 "Unable to process response "))
 
-    suspend fun redirectUserToSignIn(context: AppCompatActivity, sendToSignIn: Boolean) {
+    suspend fun redirectUserToSignIn(context: AppCompatActivity, sendToSignIn: Boolean, registerSubdomain: Boolean = false) {
         if (blockstackSignIn == null) {
             throw BlockstackConnectInvalidConfiguration(
                     "Cannot establish connection without a valid configuration"
             )
         }
-        blockstackSignIn?.redirectUserToSignIn(context, sendToSignIn)
+        blockstackSignIn?.redirectUserToSignIn(context, sendToSignIn, registerSubdomain)
     }
 
     class BlockstackConnectInvalidConfiguration(message: String) : Exception(message) {}
diff --git a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackSignIn.kt b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackSignIn.kt
index fa79e8ce..f0bb34ba 100644
--- a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackSignIn.kt
+++ b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackSignIn.kt
@@ -25,10 +25,12 @@ import java.util.*
 
 data class AppDetails(val name: String, val icon: String)
 
-class BlockstackSignIn(private val sessionStore: ISessionStore,
-                       private val appConfig: BlockstackConfig,
-                       private val appDetails: AppDetails? = null,
-                       val dispatcher: CoroutineDispatcher = Dispatchers.IO) {
+class BlockstackSignIn(
+    private val sessionStore: ISessionStore,
+    private val appConfig: BlockstackConfig,
+    private val appDetails: AppDetails? = null,
+    val dispatcher: CoroutineDispatcher = Dispatchers.IO
+) {
 
 
     /**
@@ -44,7 +46,13 @@ class BlockstackSignIn(private val sessionStore: ISessionStore,
      * @param extraParams key, value pairs that are transferred with the auth request,
      * only Boolean and String values are supported
      */
-    suspend fun makeAuthRequest(transitPrivateKey: String, expiresAt: Long = Date().time + 3600 * 24 * 7, sendToSignIn: Boolean = false, extraParams: Map<String, Any>? = null): String = withContext(dispatcher) {
+    suspend fun makeAuthRequest(
+        transitPrivateKey: String,
+        expiresAt: Long = Date().time + 3600 * 24 * 7,
+        sendToSignIn: Boolean = false,
+        extraParams: Map<String, Any>? = null,
+        registerSubdomain: Boolean = false
+    ): String = withContext(dispatcher) {
         val domainName = appConfig.appDomain.getOrigin()
         val manifestUrl = "${domainName}${appConfig.manifestPath}"
         val redirectUrl = "${domainName}${appConfig.redirectPath}"
@@ -52,20 +60,22 @@ class BlockstackSignIn(private val sessionStore: ISessionStore,
         val btcAddress = transitKeyPair.toBtcAddress()
         val issuerDID = "did:btc-addr:${btcAddress}"
         val payload = mutableMapOf(
-                "jti" to UUID.randomUUID().toString(),
-                "iat" to Date().time / 1000,
-                "exp" to expiresAt / 1000,
-                "iss" to issuerDID,
-                "public_keys" to arrayOf(transitKeyPair.toHexPublicKey64()),
-                "domain_name" to domainName,
-                "manifest_uri" to manifestUrl,
-                "redirect_uri" to redirectUrl,
-                "version" to "1.3.1",
-                "do_not_include_profile" to true,
-                "supports_hub_url" to true,
-                "scopes" to appConfig.scopes.map { it.name },
-                "sendToSignIn" to sendToSignIn,
-                "client" to "android"
+            "jti" to UUID.randomUUID().toString(),
+            "iat" to Date().time / 1000,
+            "connectVersion" to CONNECT_VERSION,
+            "registerSubdomain" to registerSubdomain,
+            "exp" to expiresAt / 1000,
+            "iss" to issuerDID,
+            "public_keys" to arrayOf(transitKeyPair.toHexPublicKey64()),
+            "domain_name" to domainName,
+            "manifest_uri" to manifestUrl,
+            "redirect_uri" to redirectUrl,
+            "version" to VERSION,
+            "do_not_include_profile" to true,
+            "supports_hub_url" to true,
+            "scopes" to appConfig.scopes.map { it.name },
+            "sendToSignIn" to sendToSignIn,
+            "client" to "android"
         )
         if (appDetails != null) {
             payload["appDetails"] = mapOf("name" to appDetails.name, "icon" to appDetails.icon)
@@ -73,13 +83,31 @@ class BlockstackSignIn(private val sessionStore: ISessionStore,
         if (extraParams != null) {
             payload.putAll(extraParams)
         }
-        return@withContext JWTTools().createJWT(payload, issuerDID, KPSigner(transitPrivateKey), algorithm = JwtHeader.ES256K)
+        return@withContext JWTTools().createJWT(
+            payload,
+            issuerDID,
+            KPSigner(transitPrivateKey),
+            algorithm = JwtHeader.ES256K
+        )
     }
 
-    suspend fun redirectUserToSignIn(context: Context, sendToSignIn: Boolean = false) {
+    suspend fun redirectUserToSignIn(
+        context: Context,
+        sendToSignIn: Boolean = false,
+        registerSubdomain: Boolean = false
+    ) {
         val transitPrivateKey = generateAndStoreTransitKey()
-        val authRequest = makeAuthRequest(transitPrivateKey, sendToSignIn = sendToSignIn)
-        redirectToSignInWithAuthRequest(context, authRequest, this.appConfig.authenticatorUrl, sendToSignIn = sendToSignIn)
+        val authRequest = makeAuthRequest(
+            transitPrivateKey,
+            sendToSignIn = sendToSignIn,
+            registerSubdomain = false
+        )
+        redirectToSignInWithAuthRequest(
+            context,
+            authRequest,
+            this.appConfig.authenticatorUrl,
+            sendToSignIn = sendToSignIn
+        )
     }
 
     /**
@@ -94,17 +122,26 @@ class BlockstackSignIn(private val sessionStore: ISessionStore,
      * @param dispatcher Context for where to run the method, default is Dispatchers.Main
      *
      */
-    suspend fun redirectToSignInWithAuthRequest(context: Context, authRequest: String, blockstackIDHost: String? = null, sendToSignIn: Boolean = false, dispatcher: CoroutineDispatcher = Dispatchers.Main) = withContext(dispatcher){
+    suspend fun redirectToSignInWithAuthRequest(
+        context: Context,
+        authRequest: String,
+        blockstackIDHost: String? = null,
+        sendToSignIn: Boolean = false,
+        dispatcher: CoroutineDispatcher = Dispatchers.Main
+    ) = withContext(dispatcher) {
         val hostUrl = blockstackIDHost ?: DEFAULT_BLOCKSTACK_ID_HOST
         val path = if (sendToSignIn) "sign-in" else "sign-up"
         val httpsURI = "${hostUrl}/#/${path}?authRequest=${authRequest}"
         openUrl(context, httpsURI)
     }
+
     fun generateAndStoreTransitKey(): String {
         val keyPair = CryptoAPI.keyPairGenerator.generate()
         val transitPrivateKey = keyPair.privateKey.key.toHexStringNoPrefix()
-        sessionStore.sessionData = SessionData(sessionStore.sessionData.json
-                .put("transitKey", transitPrivateKey))
+        sessionStore.sessionData = SessionData(
+            sessionStore.sessionData.json
+                .put("transitKey", transitPrivateKey)
+        )
         return transitPrivateKey
     }
 
@@ -117,15 +154,31 @@ class BlockstackSignIn(private val sessionStore: ISessionStore,
             options.outWidth = 24
             options.outHeight = 24
             options.inScaled = true
-            val backButton = BitmapFactory.decodeResource(context.resources, R.drawable.ic_arrow_back, options)
+            val backButton =
+                BitmapFactory.decodeResource(context.resources, R.drawable.ic_arrow_back, options)
             builder.setCloseButtonIcon(backButton)
-            builder.setToolbarColor(ContextCompat.getColor(context, R.color.org_blockstack_purple_50_logos_types))
-            builder.setToolbarColor(ContextCompat.getColor(context, R.color.org_blockstack_purple_85_lines))
+            builder.setToolbarColor(
+                ContextCompat.getColor(
+                    context,
+                    R.color.org_blockstack_purple_50_logos_types
+                )
+            )
+            builder.setToolbarColor(
+                ContextCompat.getColor(
+                    context,
+                    R.color.org_blockstack_purple_85_lines
+                )
+            )
             builder.setShowTitle(true)
             val customTabsIntent = builder.build()
             customTabsIntent.launchUrl(context, locationUri)
         } else {
-            context.startActivity(Intent(Intent.ACTION_VIEW, locationUri).addCategory(Intent.CATEGORY_BROWSABLE))
+            context.startActivity(
+                Intent(
+                    Intent.ACTION_VIEW,
+                    locationUri
+                ).addCategory(Intent.CATEGORY_BROWSABLE)
+            )
         }
     }
 
diff --git a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/Defaults.kt b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/Defaults.kt
index 18aa9e81..781185af 100644
--- a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/Defaults.kt
+++ b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/Defaults.kt
@@ -5,3 +5,4 @@ const val DEFAULT_CORE_API_ENDPOINT = "https://stacks-node-api.stacks.co"
 const val DEFAULT_BLOCKSTACK_ID_HOST = "https://app.blockstack.org"
 const val LEGACY_BLOCKSTACK_ID_HOST = "https://browser.blockstack.org/auth"
 const val VERSION = "1.3.1"
+const val CONNECT_VERSION = "4.3.18"

From e5858acaa4bfb893c47f8b2fe8699ae7e23299e2 Mon Sep 17 00:00:00 2001
From: FilipeA <filiperamosalves@gmail.com>
Date: Mon, 23 Aug 2021 15:24:21 +0100
Subject: [PATCH 09/13] fixed: missing flag on BlockstackConnectActivity

---
 .../android/sdk/BlockstackConnect.kt          | 48 ++++++++++++-----
 .../sdk/ui/BlockstackConnectActivity.kt       | 51 ++++++++++++++-----
 2 files changed, 75 insertions(+), 24 deletions(-)

diff --git a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackConnect.kt b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackConnect.kt
index cbe1c09f..91d5e985 100644
--- a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackConnect.kt
+++ b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackConnect.kt
@@ -21,9 +21,16 @@ object BlockstackConnect {
     private var dispatcher: CoroutineDispatcher = Dispatchers.IO
 
     @JvmOverloads
-    fun config(blockstackConfig: BlockstackConfig, sessionStore: ISessionStore, appDetails: AppDetails? = null, dispatcher: CoroutineDispatcher = Dispatchers.IO): BlockstackConnect {
-        blockstackSession = BlockstackSession(sessionStore, blockstackConfig, dispatcher = dispatcher)
-        blockstackSignIn = BlockstackSignIn(sessionStore, blockstackConfig, appDetails, dispatcher = dispatcher)
+    fun config(
+        blockstackConfig: BlockstackConfig,
+        sessionStore: ISessionStore,
+        appDetails: AppDetails? = null,
+        dispatcher: CoroutineDispatcher = Dispatchers.IO
+    ): BlockstackConnect {
+        blockstackSession =
+            BlockstackSession(sessionStore, blockstackConfig, dispatcher = dispatcher)
+        blockstackSignIn =
+            BlockstackSignIn(sessionStore, blockstackConfig, appDetails, dispatcher = dispatcher)
         this.dispatcher = dispatcher
         return this
     }
@@ -34,19 +41,29 @@ object BlockstackConnect {
      * @param connectScreenTheme (optional) @StyleRes to customize the Blockstack Connect Screen, by default it uses the Blockstack theme
      */
     @JvmOverloads
-    fun connect(context: Context,  @StyleRes connectScreenTheme: Int? = null) {
+    fun connect(
+        context: Context,
+        registerSubdomain: Boolean = false,
+        @StyleRes connectScreenTheme: Int? = null
+    ) {
         if (blockstackSignIn == null) {
             throw BlockstackConnectInvalidConfiguration(
-                    "Cannot establish connection without a valid configuration"
+                "Cannot establish connection without a valid configuration"
             )
         }
-        context.startActivity(BlockstackConnectActivity.getIntent(context, connectScreenTheme))
+        context.startActivity(
+            BlockstackConnectActivity.getIntent(
+                context,
+                registerSubdomain,
+                connectScreenTheme
+            )
+        )
     }
 
     suspend fun handleAuthResponse(intent: Intent): Result<UserData> {
         if (blockstackSession == null) {
             throw BlockstackConnectInvalidConfiguration(
-                    "Cannot establish connection without a valid configuration"
+                "Cannot establish connection without a valid configuration"
             )
         }
 
@@ -65,7 +82,7 @@ object BlockstackConnect {
                 Log.d(TAG, "AuthResponse token: $authResponse")
                 withContext(dispatcher) {
                     val userDataResult = blockstackSession?.handlePendingSignIn(authResponse)
-                            ?: errorResult
+                        ?: errorResult
                     result = if (userDataResult.hasValue) {
                         val userData = userDataResult.value!!
                         Log.d(TAG, "Blockstack user Auth successful")
@@ -80,14 +97,21 @@ object BlockstackConnect {
     }
 
     private inline val errorResult: Result<UserData>
-        get() = Result(null, ResultError(
+        get() = Result(
+            null, ResultError(
                 ErrorCode.UnknownError,
-                "Unable to process response "))
+                "Unable to process response "
+            )
+        )
 
-    suspend fun redirectUserToSignIn(context: AppCompatActivity, sendToSignIn: Boolean, registerSubdomain: Boolean = false) {
+    suspend fun redirectUserToSignIn(
+        context: AppCompatActivity,
+        sendToSignIn: Boolean,
+        registerSubdomain: Boolean = false
+    ) {
         if (blockstackSignIn == null) {
             throw BlockstackConnectInvalidConfiguration(
-                    "Cannot establish connection without a valid configuration"
+                "Cannot establish connection without a valid configuration"
             )
         }
         blockstackSignIn?.redirectUserToSignIn(context, sendToSignIn, registerSubdomain)
diff --git a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/ui/BlockstackConnectActivity.kt b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/ui/BlockstackConnectActivity.kt
index c9b888f8..64de85d8 100644
--- a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/ui/BlockstackConnectActivity.kt
+++ b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/ui/BlockstackConnectActivity.kt
@@ -26,9 +26,12 @@ class BlockstackConnectActivity : AppCompatActivity() {
         supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_close)
 
         //Check if BlockstackConnect Config has a custom theme
-        setTheme(savedInstanceState?.getInt(
+        setTheme(
+            savedInstanceState?.getInt(
                 EXTRA_CUSTOM_THEME,
-                R.style.Theme_Blockstack) ?: R.style.Theme_Blockstack)
+                R.style.Theme_Blockstack
+            ) ?: R.style.Theme_Blockstack
+        )
 
         setContentView(R.layout.activity_connect)
 
@@ -36,27 +39,42 @@ class BlockstackConnectActivity : AppCompatActivity() {
         // Icon
         connect_app_icon.setImageResource(applicationInfo.icon)
         //Replace Strings with the APP name
-        connect_title.text = getString(R.string.connect_dialog_title, getString(applicationInfo.labelRes))
-        connect_tracking_desc_title.text = getString(R.string.connect_activity_tracking_desc, getString(applicationInfo.labelRes))
+        connect_title.text =
+            getString(R.string.connect_dialog_title, getString(applicationInfo.labelRes))
+        connect_tracking_desc_title.text =
+            getString(R.string.connect_activity_tracking_desc, getString(applicationInfo.labelRes))
 
 
         //Button Listeners
+        val registerSubdomain = savedInstanceState?.getBoolean(EXTRA_REGISTER_SUBDOMAIN) ?: false
+
         connect_get_secret_key.setOnClickListener {
             lifecycle.coroutineScope.launch(Dispatchers.IO) {
-                BlockstackConnect.redirectUserToSignIn(this@BlockstackConnectActivity, sendToSignIn = false)
+                BlockstackConnect.redirectUserToSignIn(
+                    this@BlockstackConnectActivity,
+                    sendToSignIn = false,
+                    registerSubdomain = registerSubdomain
+                )
                 this@BlockstackConnectActivity.finish()
             }
         }
 
         connect_sign_in.setOnClickListener {
             lifecycle.coroutineScope.launch(Dispatchers.IO) {
-                BlockstackConnect.redirectUserToSignIn(this@BlockstackConnectActivity, sendToSignIn = true)
+                BlockstackConnect.redirectUserToSignIn(
+                    this@BlockstackConnectActivity,
+                    sendToSignIn = true,
+                    registerSubdomain = registerSubdomain
+                )
                 this@BlockstackConnectActivity.finish()
             }
         }
 
         connect_how_it_works.setOnClickListener {
-            startActivityForResult(Intent(this, ConnectHowItWorksActivity::class.java), REQUEST_HOW_IT_WORKS)
+            startActivityForResult(
+                Intent(this, ConnectHowItWorksActivity::class.java),
+                REQUEST_HOW_IT_WORKS
+            )
         }
 
     }
@@ -68,7 +86,10 @@ class BlockstackConnectActivity : AppCompatActivity() {
         //Intercept Get Started click from ConnectHowItWorks
         if (resultCode == RESULT_OK && requestCode == REQUEST_HOW_IT_WORKS) {
             lifecycle.coroutineScope.launch {
-                BlockstackConnect.redirectUserToSignIn(this@BlockstackConnectActivity, sendToSignIn = false)
+                BlockstackConnect.redirectUserToSignIn(
+                    this@BlockstackConnectActivity,
+                    sendToSignIn = false
+                )
                 this@BlockstackConnectActivity.finish()
             }
         }
@@ -82,10 +103,16 @@ class BlockstackConnectActivity : AppCompatActivity() {
     companion object {
         private val REQUEST_HOW_IT_WORKS = 1
         val EXTRA_CUSTOM_THEME = "styleResCustomTheme"
-
-        fun getIntent(context : Context, @StyleRes theme : Int? = null) : Intent{
-            val intent = Intent(context, BlockstackConnectActivity::class.java)
-            return intent.putExtra(EXTRA_CUSTOM_THEME, theme)
+        val EXTRA_REGISTER_SUBDOMAIN = "styleResCustomTheme"
+
+        fun getIntent(
+            context: Context,
+            registerSubdomain: Boolean = false,
+            @StyleRes theme: Int? = null
+        ): Intent {
+            return Intent(context, BlockstackConnectActivity::class.java)
+                .putExtra(EXTRA_CUSTOM_THEME, theme)
+                .putExtra(EXTRA_REGISTER_SUBDOMAIN, registerSubdomain)
         }
     }
 

From 29d9d55c1e80a77c97aa049701060be5bc02e88d Mon Sep 17 00:00:00 2001
From: FilipeA <filiperamosalves@gmail.com>
Date: Mon, 23 Aug 2021 15:39:50 +0100
Subject: [PATCH 10/13] fixed: issue with Intent extra name

---
 .../org/blockstack/android/sdk/ui/BlockstackConnectActivity.kt  | 2 +-
 example/src/main/java/org/blockstack/android/MainActivity.kt    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/ui/BlockstackConnectActivity.kt b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/ui/BlockstackConnectActivity.kt
index 64de85d8..0fbde487 100644
--- a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/ui/BlockstackConnectActivity.kt
+++ b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/ui/BlockstackConnectActivity.kt
@@ -103,7 +103,7 @@ class BlockstackConnectActivity : AppCompatActivity() {
     companion object {
         private val REQUEST_HOW_IT_WORKS = 1
         val EXTRA_CUSTOM_THEME = "styleResCustomTheme"
-        val EXTRA_REGISTER_SUBDOMAIN = "styleResCustomTheme"
+        val EXTRA_REGISTER_SUBDOMAIN = "registerSubdomain"
 
         fun getIntent(
             context: Context,
diff --git a/example/src/main/java/org/blockstack/android/MainActivity.kt b/example/src/main/java/org/blockstack/android/MainActivity.kt
index 57081e85..411894eb 100644
--- a/example/src/main/java/org/blockstack/android/MainActivity.kt
+++ b/example/src/main/java/org/blockstack/android/MainActivity.kt
@@ -75,7 +75,7 @@ class MainActivity : AppCompatActivity() {
                 .config(config, sessionStore, appDetails)
 
         signInButton.setOnClickListener {
-            BlockstackConnect.connect(this@MainActivity)
+            BlockstackConnect.connect(this@MainActivity, true)
         }
 
         signInButtonWithGaia.setOnClickListener {

From 5ef93a0af242cf0597464f9ac3cd038db13696a3 Mon Sep 17 00:00:00 2001
From: FilipeA <filiperamosalves@gmail.com>
Date: Mon, 23 Aug 2021 15:50:50 +0100
Subject: [PATCH 11/13] fixed: issue with Intent data

---
 .../blockstack/android/sdk/ui/BlockstackConnectActivity.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/ui/BlockstackConnectActivity.kt b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/ui/BlockstackConnectActivity.kt
index 0fbde487..454d3022 100644
--- a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/ui/BlockstackConnectActivity.kt
+++ b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/ui/BlockstackConnectActivity.kt
@@ -27,7 +27,7 @@ class BlockstackConnectActivity : AppCompatActivity() {
 
         //Check if BlockstackConnect Config has a custom theme
         setTheme(
-            savedInstanceState?.getInt(
+            intent?.getIntExtra(
                 EXTRA_CUSTOM_THEME,
                 R.style.Theme_Blockstack
             ) ?: R.style.Theme_Blockstack
@@ -46,7 +46,7 @@ class BlockstackConnectActivity : AppCompatActivity() {
 
 
         //Button Listeners
-        val registerSubdomain = savedInstanceState?.getBoolean(EXTRA_REGISTER_SUBDOMAIN) ?: false
+        val registerSubdomain = intent.getBooleanExtra(EXTRA_REGISTER_SUBDOMAIN, false)
 
         connect_get_secret_key.setOnClickListener {
             lifecycle.coroutineScope.launch(Dispatchers.IO) {

From 857133fc2c82093dabc145f40e89b220c96e58b1 Mon Sep 17 00:00:00 2001
From: FilipeA <filiperamosalves@gmail.com>
Date: Mon, 23 Aug 2021 16:29:00 +0100
Subject: [PATCH 12/13] fixed: issue with unused variable

---
 .../main/java/org/blockstack/android/sdk/BlockstackSignIn.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackSignIn.kt b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackSignIn.kt
index f0bb34ba..0df5e3d0 100644
--- a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackSignIn.kt
+++ b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackSignIn.kt
@@ -100,7 +100,7 @@ class BlockstackSignIn(
         val authRequest = makeAuthRequest(
             transitPrivateKey,
             sendToSignIn = sendToSignIn,
-            registerSubdomain = false
+            registerSubdomain = registerSubdomain
         )
         redirectToSignInWithAuthRequest(
             context,

From f60d325d39bfebccbda4b7a8b8cc4a7fe48006ac Mon Sep 17 00:00:00 2001
From: FilipeA <filiperamosalves@gmail.com>
Date: Mon, 23 Aug 2021 15:24:21 +0100
Subject: [PATCH 13/13] fixed: missing flag on BlockstackConnectActivity

fixed: issue with Intent extra name

fixed: issue with Intent data

fixed: issue with unused variable
---
 .../android/sdk/BlockstackConnect.kt          | 48 ++++++++++++-----
 .../android/sdk/BlockstackSignIn.kt           |  2 +-
 .../sdk/ui/BlockstackConnectActivity.kt       | 51 ++++++++++++++-----
 .../org/blockstack/android/MainActivity.kt    |  2 +-
 4 files changed, 77 insertions(+), 26 deletions(-)

diff --git a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackConnect.kt b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackConnect.kt
index cbe1c09f..91d5e985 100644
--- a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackConnect.kt
+++ b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackConnect.kt
@@ -21,9 +21,16 @@ object BlockstackConnect {
     private var dispatcher: CoroutineDispatcher = Dispatchers.IO
 
     @JvmOverloads
-    fun config(blockstackConfig: BlockstackConfig, sessionStore: ISessionStore, appDetails: AppDetails? = null, dispatcher: CoroutineDispatcher = Dispatchers.IO): BlockstackConnect {
-        blockstackSession = BlockstackSession(sessionStore, blockstackConfig, dispatcher = dispatcher)
-        blockstackSignIn = BlockstackSignIn(sessionStore, blockstackConfig, appDetails, dispatcher = dispatcher)
+    fun config(
+        blockstackConfig: BlockstackConfig,
+        sessionStore: ISessionStore,
+        appDetails: AppDetails? = null,
+        dispatcher: CoroutineDispatcher = Dispatchers.IO
+    ): BlockstackConnect {
+        blockstackSession =
+            BlockstackSession(sessionStore, blockstackConfig, dispatcher = dispatcher)
+        blockstackSignIn =
+            BlockstackSignIn(sessionStore, blockstackConfig, appDetails, dispatcher = dispatcher)
         this.dispatcher = dispatcher
         return this
     }
@@ -34,19 +41,29 @@ object BlockstackConnect {
      * @param connectScreenTheme (optional) @StyleRes to customize the Blockstack Connect Screen, by default it uses the Blockstack theme
      */
     @JvmOverloads
-    fun connect(context: Context,  @StyleRes connectScreenTheme: Int? = null) {
+    fun connect(
+        context: Context,
+        registerSubdomain: Boolean = false,
+        @StyleRes connectScreenTheme: Int? = null
+    ) {
         if (blockstackSignIn == null) {
             throw BlockstackConnectInvalidConfiguration(
-                    "Cannot establish connection without a valid configuration"
+                "Cannot establish connection without a valid configuration"
             )
         }
-        context.startActivity(BlockstackConnectActivity.getIntent(context, connectScreenTheme))
+        context.startActivity(
+            BlockstackConnectActivity.getIntent(
+                context,
+                registerSubdomain,
+                connectScreenTheme
+            )
+        )
     }
 
     suspend fun handleAuthResponse(intent: Intent): Result<UserData> {
         if (blockstackSession == null) {
             throw BlockstackConnectInvalidConfiguration(
-                    "Cannot establish connection without a valid configuration"
+                "Cannot establish connection without a valid configuration"
             )
         }
 
@@ -65,7 +82,7 @@ object BlockstackConnect {
                 Log.d(TAG, "AuthResponse token: $authResponse")
                 withContext(dispatcher) {
                     val userDataResult = blockstackSession?.handlePendingSignIn(authResponse)
-                            ?: errorResult
+                        ?: errorResult
                     result = if (userDataResult.hasValue) {
                         val userData = userDataResult.value!!
                         Log.d(TAG, "Blockstack user Auth successful")
@@ -80,14 +97,21 @@ object BlockstackConnect {
     }
 
     private inline val errorResult: Result<UserData>
-        get() = Result(null, ResultError(
+        get() = Result(
+            null, ResultError(
                 ErrorCode.UnknownError,
-                "Unable to process response "))
+                "Unable to process response "
+            )
+        )
 
-    suspend fun redirectUserToSignIn(context: AppCompatActivity, sendToSignIn: Boolean, registerSubdomain: Boolean = false) {
+    suspend fun redirectUserToSignIn(
+        context: AppCompatActivity,
+        sendToSignIn: Boolean,
+        registerSubdomain: Boolean = false
+    ) {
         if (blockstackSignIn == null) {
             throw BlockstackConnectInvalidConfiguration(
-                    "Cannot establish connection without a valid configuration"
+                "Cannot establish connection without a valid configuration"
             )
         }
         blockstackSignIn?.redirectUserToSignIn(context, sendToSignIn, registerSubdomain)
diff --git a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackSignIn.kt b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackSignIn.kt
index f0bb34ba..0df5e3d0 100644
--- a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackSignIn.kt
+++ b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/BlockstackSignIn.kt
@@ -100,7 +100,7 @@ class BlockstackSignIn(
         val authRequest = makeAuthRequest(
             transitPrivateKey,
             sendToSignIn = sendToSignIn,
-            registerSubdomain = false
+            registerSubdomain = registerSubdomain
         )
         redirectToSignInWithAuthRequest(
             context,
diff --git a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/ui/BlockstackConnectActivity.kt b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/ui/BlockstackConnectActivity.kt
index c9b888f8..454d3022 100644
--- a/blockstack-sdk/src/main/java/org/blockstack/android/sdk/ui/BlockstackConnectActivity.kt
+++ b/blockstack-sdk/src/main/java/org/blockstack/android/sdk/ui/BlockstackConnectActivity.kt
@@ -26,9 +26,12 @@ class BlockstackConnectActivity : AppCompatActivity() {
         supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_close)
 
         //Check if BlockstackConnect Config has a custom theme
-        setTheme(savedInstanceState?.getInt(
+        setTheme(
+            intent?.getIntExtra(
                 EXTRA_CUSTOM_THEME,
-                R.style.Theme_Blockstack) ?: R.style.Theme_Blockstack)
+                R.style.Theme_Blockstack
+            ) ?: R.style.Theme_Blockstack
+        )
 
         setContentView(R.layout.activity_connect)
 
@@ -36,27 +39,42 @@ class BlockstackConnectActivity : AppCompatActivity() {
         // Icon
         connect_app_icon.setImageResource(applicationInfo.icon)
         //Replace Strings with the APP name
-        connect_title.text = getString(R.string.connect_dialog_title, getString(applicationInfo.labelRes))
-        connect_tracking_desc_title.text = getString(R.string.connect_activity_tracking_desc, getString(applicationInfo.labelRes))
+        connect_title.text =
+            getString(R.string.connect_dialog_title, getString(applicationInfo.labelRes))
+        connect_tracking_desc_title.text =
+            getString(R.string.connect_activity_tracking_desc, getString(applicationInfo.labelRes))
 
 
         //Button Listeners
+        val registerSubdomain = intent.getBooleanExtra(EXTRA_REGISTER_SUBDOMAIN, false)
+
         connect_get_secret_key.setOnClickListener {
             lifecycle.coroutineScope.launch(Dispatchers.IO) {
-                BlockstackConnect.redirectUserToSignIn(this@BlockstackConnectActivity, sendToSignIn = false)
+                BlockstackConnect.redirectUserToSignIn(
+                    this@BlockstackConnectActivity,
+                    sendToSignIn = false,
+                    registerSubdomain = registerSubdomain
+                )
                 this@BlockstackConnectActivity.finish()
             }
         }
 
         connect_sign_in.setOnClickListener {
             lifecycle.coroutineScope.launch(Dispatchers.IO) {
-                BlockstackConnect.redirectUserToSignIn(this@BlockstackConnectActivity, sendToSignIn = true)
+                BlockstackConnect.redirectUserToSignIn(
+                    this@BlockstackConnectActivity,
+                    sendToSignIn = true,
+                    registerSubdomain = registerSubdomain
+                )
                 this@BlockstackConnectActivity.finish()
             }
         }
 
         connect_how_it_works.setOnClickListener {
-            startActivityForResult(Intent(this, ConnectHowItWorksActivity::class.java), REQUEST_HOW_IT_WORKS)
+            startActivityForResult(
+                Intent(this, ConnectHowItWorksActivity::class.java),
+                REQUEST_HOW_IT_WORKS
+            )
         }
 
     }
@@ -68,7 +86,10 @@ class BlockstackConnectActivity : AppCompatActivity() {
         //Intercept Get Started click from ConnectHowItWorks
         if (resultCode == RESULT_OK && requestCode == REQUEST_HOW_IT_WORKS) {
             lifecycle.coroutineScope.launch {
-                BlockstackConnect.redirectUserToSignIn(this@BlockstackConnectActivity, sendToSignIn = false)
+                BlockstackConnect.redirectUserToSignIn(
+                    this@BlockstackConnectActivity,
+                    sendToSignIn = false
+                )
                 this@BlockstackConnectActivity.finish()
             }
         }
@@ -82,10 +103,16 @@ class BlockstackConnectActivity : AppCompatActivity() {
     companion object {
         private val REQUEST_HOW_IT_WORKS = 1
         val EXTRA_CUSTOM_THEME = "styleResCustomTheme"
-
-        fun getIntent(context : Context, @StyleRes theme : Int? = null) : Intent{
-            val intent = Intent(context, BlockstackConnectActivity::class.java)
-            return intent.putExtra(EXTRA_CUSTOM_THEME, theme)
+        val EXTRA_REGISTER_SUBDOMAIN = "registerSubdomain"
+
+        fun getIntent(
+            context: Context,
+            registerSubdomain: Boolean = false,
+            @StyleRes theme: Int? = null
+        ): Intent {
+            return Intent(context, BlockstackConnectActivity::class.java)
+                .putExtra(EXTRA_CUSTOM_THEME, theme)
+                .putExtra(EXTRA_REGISTER_SUBDOMAIN, registerSubdomain)
         }
     }
 
diff --git a/example/src/main/java/org/blockstack/android/MainActivity.kt b/example/src/main/java/org/blockstack/android/MainActivity.kt
index 57081e85..411894eb 100644
--- a/example/src/main/java/org/blockstack/android/MainActivity.kt
+++ b/example/src/main/java/org/blockstack/android/MainActivity.kt
@@ -75,7 +75,7 @@ class MainActivity : AppCompatActivity() {
                 .config(config, sessionStore, appDetails)
 
         signInButton.setOnClickListener {
-            BlockstackConnect.connect(this@MainActivity)
+            BlockstackConnect.connect(this@MainActivity, true)
         }
 
         signInButtonWithGaia.setOnClickListener {