Add Lightning

Author: angelix

base/build.gradle

@@ -21,6 +21,8 @@ object Urls {
     const val HELP_MNEMONIC_BACKUP = "https://help.blockstream.com/hc/en-us/articles/900001392563-What-is-a-mnemonic-backup-"
     const val HELP_NLOCKTIMES = "https://help.blockstream.com/hc/en-us/articles/900004249546-The-upgrade-from-nLockTime-to-CheckSequenceVerify"
     const val HELP_FEES = "https://help.blockstream.com/hc/en-us/articles/4412578550809"
+    const val HELP_RECEIVE_FEES = "https://help.blockstream.com/hc/en-us/articles/18788578831897"
+    const val HELP_RECEIVE_CAPACITY = "https://help.blockstream.com/hc/en-us/articles/18788499177753"
     const val HELP_GET_LIQUID = "https://help.blockstream.com/hc/en-us/articles/900000630846-How-do-I-get-Liquid-Bitcoin-L-BTC-"
     const val HELP_JADE_USB_UPGRADE = "https://help.blockstream.com/hc/en-us/articles/4408030503577"
     const val HELP_WHATS_COLLECTED = "https://help.blockstream.com/hc/en-us/articles/5988514431897"

base/src/main/java/com/blockstream/base/Constants.kt

@@ -25,6 +25,7 @@ allprojects {
         google()
         mavenCentral()
         maven ("https://jitpack.io")
+        maven("https://mvn.breez.technology/releases")
     }
 }
 

build.gradle.kts

@@ -1,3 +1,5 @@
+import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
+
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
@@ -11,6 +13,15 @@ android {
 
     defaultConfig {
         minSdk = 23
+
+        val breezApiKey = System.getenv("BREEZ_API_KEY") ?: gradleLocalProperties(rootDir).getProperty("breez.apikey", "")
+        val greenlightCertificate = System.getenv("GREENLIGHT_DEVICE_CERT") ?: gradleLocalProperties(rootDir).getProperty("greenlight.cert", "")
+        val greenlightKey = System.getenv("GREENLIGHT_DEVICE_KEY") ?: gradleLocalProperties(rootDir).getProperty("greenlight.key", "")
+
+        buildConfigField("String", "BREEZ_API_KEY", "\"${breezApiKey}\"")
+        buildConfigField("String", "GREENLIGHT_DEVICE_CERT", "\"${greenlightCertificate}\"")
+        buildConfigField("String", "GREENLIGHT_DEVICE_KEY", "\"${greenlightKey}\"")
+
         consumerProguardFiles("consumer-rules.pro")
     }
     compileOptions {
@@ -50,10 +61,13 @@ afterEvaluate {
 }
 
 dependencies {
+    /**  --- Modules ---------------------------------------------------------------------------- */
+    api(project(":lightning"))
+    /** ----------------------------------------------------------------------------------------- */
 
     /**  --- Kotlin & KotlinX ------------------------------------------------------------------- */
-    implementation libs.kotlinx.serialization.core
-    implementation libs.kotlinx.serialization.json
+    implementation(libs.kotlinx.serialization.core)
+    implementation(libs.kotlinx.serialization.json)
     implementation(libs.kotlinx.datetime)
     /** ----------------------------------------------------------------------------------------- */
 

crypto/build.gradle.kts

@@ -104,6 +104,7 @@ rm ${TARBALL}
 
 # Move the libraries and Java wrapper where we need them
 mv ${NAME}/lib/ ${CRYPTO_MODULE_ROOT}/src/main/jniLibs/
+rm -rf ${CRYPTO_MODULE_ROOT}/src/main/jniLibs/*/gdk # remove unnecessary files
 mv ${NAME}/share/java/com/blockstream/libgreenaddress/GDK.java ${GDK_JAVA_DIR}/libgreenaddress/GDK.java
 mv ${NAME}/share/java/com/blockstream/libwally/Wally.java ${GDK_JAVA_DIR}/libwally/Wally.java
 

crypto/fetch_gdk_binaries.sh

@@ -0,0 +1,7 @@
+package com.blockstream.gdk
+
+const val BTC_UNIT = "BTC"
+const val MBTC_UNIT = "mBTC"
+const val UBTC_UNIT = "\u00B5BTC"
+const val BITS_UNIT = "bits"
+const val SATOSHI_UNIT = "sats"

crypto/src/main/java/com/blockstream/gdk/Constants.kt

@@ -32,6 +32,7 @@ import com.blockstream.gdk.params.SubAccountParams
 import com.blockstream.gdk.params.SubAccountsParams
 import com.blockstream.gdk.params.TransactionParams
 import com.blockstream.gdk.params.UpdateSubAccountParams
+import com.blockstream.gdk.params.ValidateAddresseesParams
 import com.blockstream.libgreenaddress.GAAuthHandler
 import com.blockstream.libgreenaddress.GASession
 import com.blockstream.libgreenaddress.GDK
@@ -60,9 +61,6 @@ class GdkBridge constructor(
     isDevelopment: Boolean,
     extraLogger: Logger? = null
 ) {
-
-    private val bip39WordList by lazy { wally.bip39Wordlist(BIP39_WORD_LIST_LANG) }
-
     val networks by lazy {
         val jsonElement = gdk.getNetworks() as JsonElement
         Networks.fromJsonElement(JsonDeserializer, jsonElement)
@@ -91,6 +89,8 @@ class GdkBridge constructor(
         }
     }
 
+    val breezSdkWorkingDir by lazy { File(dataDir, "breezSdk") }
+
     private fun randomBytes(len: Int): ByteArray {
         return ByteArray(len).also {
             SecureRandom().nextBytes(it)
@@ -174,6 +174,11 @@ class GdkBridge constructor(
         params: JsonElement
     ) = gdk.validate(session, params)
 
+    fun validate(
+        session: GASession,
+        params: ValidateAddresseesParams
+    ) = gdk.validate(session, params)
+
     fun encryptWithPin(
         session: GASession,
         encryptWithPinParams: EncryptWithPinParams
@@ -321,16 +326,15 @@ class GdkBridge constructor(
 
     fun getMnemonicWordList(): List<String> {
         val wordList = mutableListOf<String>()
-        val enWords = bip39WordList
         for (i in 0 until wally.BIP39_WORDLIST_LEN) {
-            wordList += wally.bip39Word(enWords, i)
+            wordList += wally.bip39Word(i)
         }
 
         return wordList
     }
 
     fun isMnemonicValid(mnemonic: String): Boolean {
-        return wally.bip39MnemonicValidate(bip39WordList, mnemonic)
+        return wally.bip39MnemonicValidate(mnemonic)
     }
 
     fun isXpubValid(xpub: String): Boolean {
@@ -352,6 +356,10 @@ class GdkBridge constructor(
         }
     }
 
+    fun bip85FromMnemonic(mnemonic: String, passphrase: String?, index: Long =  0, isTestnet: Boolean = false): String {
+        return wally.bip85FromMnemonic(mnemonic = mnemonic, passphrase = passphrase, isTestnet = isTestnet, index = index)
+    }
+
     fun hasGdkCache(loginData: LoginData): Boolean {
         return File(dataDir, "state/${loginData.networkHashId}").exists()
     }
@@ -373,8 +381,6 @@ class GdkBridge constructor(
             isLenient = true
         }
 
-        const val BIP39_WORD_LIST_LANG = "en"
-
         const val KEY_CUSTOM_NETWORK = "custom_network"
 
         // val FeeBlockTarget = listOf(3, 12, 24) // Old calculations

crypto/src/main/java/com/blockstream/gdk/GdkBridge.kt

@@ -34,8 +34,8 @@ class NetworkAssetManager constructor(
     val coroutineScope: CoroutineScope,
     val qaTester: AssetQATester,
 ) {
-    private var metadata = mutableMapOf<String, Asset?>()
-    private var icons = mutableMapOf<String, Bitmap?>()
+    private val metadata = mutableMapOf<String, Asset?>()
+    private val icons = mutableMapOf<String, Bitmap?>()
 
     private val _statusStateFlow = MutableStateFlow(AssetStatus())
     private val _status get() = _statusStateFlow.value
@@ -103,16 +103,16 @@ class NetworkAssetManager constructor(
             ?: context.getDrawable(R.drawable.ic_unknown)!!
     }
 
-    fun updateAssetsIfNeeded(provider: AssetsProvider, forceUpdate: Boolean = false) {
-        if (_status.cacheStatus != CacheStatus.Latest || forceUpdate) {
+    fun updateAssetsIfNeeded(provider: AssetsProvider) {
+        if (_status.cacheStatus != CacheStatus.Latest) {
 
             coroutineScope.launch(context = Dispatchers.IO) {
 
                 try {
                     _statusStateFlow.value = _status.apply { onProgress = true }
 
                     // Allow forceUpdate to override QATester settings
-                    if (!qaTester.isAssetFetchDisabled() || forceUpdate) {
+                    if (!qaTester.isAssetFetchDisabled()) {
                         // Try to update the registry
                         provider.refreshAssets(
                             AssetsParams(
@@ -122,9 +122,6 @@ class NetworkAssetManager constructor(
                             )
                         )
 
-                        // Clear our local cache
-                        metadata.clear()
-
                         _status.cacheStatus = CacheStatus.Latest
                     }
 
@@ -138,9 +135,5 @@ class NetworkAssetManager constructor(
         }
     }
 
-
-    companion object : KLogging(){
-        const val REMOTE_CONFIG_ASSETS_MAINNET = "liquid_assets"
-        const val REMOTE_CONFIG_ASSETS_TESTNET = "liquid_assets_testnet"
-    }
+    companion object: KLogging()
 }

crypto/src/main/java/com/blockstream/gdk/NetworkAssetManager.kt

@@ -24,8 +24,8 @@ data class Account constructor(
     @SerialName("bip44_discovered") val bip44Discovered: Boolean? = null,
     @SerialName("core_descriptors") val coreDescriptors: List<String>? = null,
     @SerialName("slip132_extended_pubkey") val extendedPubkey: String? = null,
-    @SerialName("user_path") val derivationPath: List<Long>? = null,
-) : Parcelable {
+    @SerialName("user_path") val derivationPath: List<Long>? = null
+) : Parcelable, Comparable<Account> {
 
     @IgnoredOnParcel
     val network
@@ -44,6 +44,9 @@ data class Account constructor(
     val isMultisig
         get() = network.isMultisig
 
+    val isLightning
+        get() = type == AccountType.LIGHTNING
+
     val networkId
         get() = network.id
 
@@ -71,6 +74,18 @@ data class Account constructor(
     val outputDescriptors: String?
         get() = coreDescriptors?.joinToString("\n")
 
+    @IgnoredOnParcel
+    private val weight by lazy {
+        when{
+            isBitcoin && isSinglesig -> 0
+            isBitcoin && isMultisig -> 1
+            isLightning -> 2
+            isLiquid && isSinglesig -> 3
+            isLiquid && isMultisig && !isAmp -> 4
+            isLiquid && isMultisig && isAmp -> 5
+            else -> 6
+        }
+    }
 
     @IgnoredOnParcel
     val name: String by lazy {
@@ -152,4 +167,12 @@ data class Account constructor(
     fun getRecoveryPubKeyAsBytes(): ByteArray? {
         return Wally.hex_to_bytes(recoveryPubKey)
     }
+
+    override fun compareTo(other: Account): Int {
+        return if (weight == other.weight) {
+            pointer.compareTo(other.pointer)
+        } else {
+            weight.compareTo(other.weight)
+        }
+    }
 }

crypto/src/main/java/com/blockstream/gdk/data/Account.kt

@@ -19,10 +19,14 @@ enum class AccountType(val gdkType: String) {
 
     override fun toString(): String = when(this){
         BIP44_LEGACY -> "Legacy"
-        BIP49_SEGWIT_WRAPPED -> "Legacy"
-        BIP84_SEGWIT -> "SegWit"
+        BIP49_SEGWIT_WRAPPED -> "Standard"
+        BIP84_SEGWIT -> "Native SegWit"
         BIP86_TAPROOT -> "Taproot"
         LIGHTNING -> "Lightning"
+
+        STANDARD -> "2FA Protected"
+        AMP_ACCOUNT -> "AMP"
+        TWO_OF_THREE -> "2of3 with 2FA"
         else -> gdkType
     }
 
@@ -31,7 +35,9 @@ enum class AccountType(val gdkType: String) {
         else -> false
     }
 
-    fun isMutlisig() = !isSinglesig()
+    fun isLightning() = this == LIGHTNING
+
+    fun isMutlisig() = !isSinglesig() && !isLightning()
 
     companion object {
         fun byGDKType(name: String) = when(name){