Release/4.14

.editorconfig

@@ -0,0 +1,3 @@
+[*.{kt,kts}]
+indent_size=4
+disabled_rules=no-wildcard-imports

.gitignore

@@ -137,4 +137,5 @@ DerivedData/
 cosmos-bundled/build-frameworks/
 !cosmos-bundled/build-frameworks/Cosmos.xcframework/Info.plist
 !cosmos-bundled/build-frameworks/Cosmos.xcframework/ios-arm64/Cosmos.framework/Info.plist
+!cosmos-bundled/build-frameworks/Cosmos.xcframework/ios-arm64-simulator/Cosmos.framework/Info.plist
 !cosmos-bundled/build-frameworks/Cosmos.xcframework/ios-x86_64-simulator/Cosmos.framework/Info.plist

.gitlab-ci.yml

@@ -6,7 +6,7 @@ stages:
 #  - template: Managed-Cluster-Applications.gitlab-ci.yml
 
 default:
-#  image: alvrme/alpine-android:android-29-jdk11
+  #  image: alvrme/alpine-android:android-29-jdk11
   tags:
     - macos
   before_script:
@@ -48,6 +48,25 @@ build-cosmos:
     paths:
       - ./**/build/reports/tests
 
+build-ios:
+  stage: build
+  only:
+    refs:
+      - main
+      - develop
+      - merge_requests
+    changes:
+      - buildSrc/**/Libs.kt
+      - brd-ios/**/*
+      - cosmos-*/**/*
+      - .gitlab-ci.yml
+  script:
+    - ./gradlew :cosmos-bundled:createXCFramework
+    - xcodebuild clean -workspace brd-ios/breadwallet.xcworkspace -scheme breadwallet | xcpretty
+    # - xcodebuild test -workspace brd-ios/breadwallet.xcworkspace -scheme breadwallet -destination 'platform=iOS Simulator,name=iPhone 13 mini,OS=15.0' | xcpretty -s
+  tags:
+    - macos
+
 build-android:
   stage: build
   script:
@@ -59,37 +78,21 @@ build-android:
       - merge_requests
     changes:
       - buildSrc/**/Libs.kt
+      - buildSrc/**/BrdRelease.kt
       - brd-android/**/*
       - cosmos-*/**/*
       - .gitlab-ci.yml
   artifacts:
+    when: always
     paths:
       - brd-android/app/build/outputs/apk/brd/debug/
       - brd-android/app/build/outputs/apk/brd/release/
       - brd-android/app/build/outputs/apk/brdTestnet/debug/
       - brd-android/app/build/outputs/apk/brdTestnet/release/
+      - ./**/build/reports/**/*
     reports:
       junit: ./brd-android/**/build/test-results/**/TEST-*.xml
 
-build-ios:
-  stage: build
-  only:
-    refs:
-      - main
-      - develop
-      - merge_requests
-    changes:
-      - buildSrc/**/Libs.kt
-      - brd-ios/**/*
-      - cosmos-*/**/*
-      - .gitlab-ci.yml
-  script:
-    - ./gradlew :cosmos-bundled:createXCFramework
-    - xcodebuild clean -workspace brd-ios/breadwallet.xcworkspace -scheme breadwallet | xcpretty
-    - xcodebuild test -workspace brd-ios/breadwallet.xcworkspace -scheme breadwallet -destination 'platform=iOS Simulator,name=iPhone 12,OS=14.5' | xcpretty -s
-  tags:
-    - macos
-
 deploy-appetize:
   stage: deploy
   needs: [ "build-android" ]
@@ -142,6 +145,7 @@ deploy-firebase:
     - ./gradlew :brd-android:app:uploadCrashlyticsSymbolFileBrdDebug
     - ./gradlew :brd-android:app:appDistributionUploadBrdTestnetDebug
     - ./gradlew :brd-android:app:uploadCrashlyticsSymbolFileBrdTestnetDebug
+    - ./gradlew postToSlack
   rules:
     - if: '$CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ /^android/'
   artifacts:

brd-android/app-core/build.gradle.kts

@@ -16,13 +16,13 @@ project.tasks.register<brd.DownloadBundles>("downloadBundles")
 project.tasks.register<brd.DownloadSupportArticles>("downloadSupportArticles")
 
 android {
-    compileSdkVersion(BrdRelease.ANDROID_COMPILE_SDK)
-    buildToolsVersion(BrdRelease.ANDROID_BUILD_TOOLS)
+    compileSdk = BrdRelease.ANDROID_COMPILE_SDK
+    buildToolsVersion = (BrdRelease.ANDROID_BUILD_TOOLS)
     defaultConfig {
-        minSdkVersion(BrdRelease.ANDROID_MINIMUM_SDK)
+        minSdk = BrdRelease.ANDROID_MINIMUM_SDK
         buildConfigField("int", "VERSION_CODE", "${BrdRelease.versionCode}")
     }
-    lintOptions {
+    lint {
         isAbortOnError = false
     }
 
@@ -43,7 +43,12 @@ dependencies {
     implementation(Libs.Coroutines.Core) {
         version { strictly(brd.COROUTINES_VERSION) }
     }
-    api(Libs.WalletKit.CoreAndroid)
+    val overrideIdeCheck = gradle.startParameter.taskNames.any { it.contains("brd-android") }
+    if (System.getProperty("idea.active") == "true" && !overrideIdeCheck) {
+        implementation(Libs.WalletKit.CoreJRE)
+    } else {
+        implementation(Libs.WalletKit.CoreAndroid)
+    }
 
     implementation(Libs.Androidx.LifecycleExtensions)
     implementation(Libs.Androidx.AppCompat)
@@ -60,7 +65,7 @@ dependencies {
     implementation(Libs.Firebase.Crashlytics)
 
     // Kodein DI
-    implementation(Libs.Kodein.CoreErasedJvm)
+    implementation(Libs.Kodein.Core)
     implementation(Libs.Kodein.FrameworkAndroidX)
 
     implementation(Libs.Jbsdiff.Core)

brd-android/app-core/src/main/java/com/breadwallet/app/Conversion.kt

@@ -10,8 +10,8 @@ package com.breadwallet.app
 
 import com.breadwallet.breadbox.hashString
 import com.breadwallet.breadbox.toBigDecimal
-import com.breadwallet.crypto.Transfer
-import com.breadwallet.crypto.TransferState
+import com.blockset.walletkit.Transfer
+import com.blockset.walletkit.TransferState
 import java.util.Date
 
 private const val PREFIX_DELIMITER = "-"
@@ -66,4 +66,4 @@ data class Trade(override val currencyCode: String, val hashString: String) : Co
             return Trade(currencyCode, hashString)
         }
     }
-}
+}

brd-android/app-core/src/main/java/com/breadwallet/breadbox/BreadBox.kt

@@ -8,12 +8,12 @@
  */
 package com.breadwallet.breadbox
 
-import com.breadwallet.crypto.Account
-import com.breadwallet.crypto.Network
+import com.blockset.walletkit.Account
+import com.blockset.walletkit.Network
 
-import com.breadwallet.crypto.Wallet
-import com.breadwallet.crypto.System
-import com.breadwallet.crypto.Transfer
+import com.blockset.walletkit.Wallet
+import com.blockset.walletkit.System
+import com.blockset.walletkit.Transfer
 import kotlinx.coroutines.flow.Flow
 
 /** Provides access to data from a lazily created [System] using [Flow]s. */

brd-android/app-core/src/main/java/com/breadwallet/breadbox/CoreUtils.kt

@@ -10,19 +10,21 @@
 
 package com.breadwallet.breadbox
 
-import com.breadwallet.crypto.Address
-import com.breadwallet.crypto.Currency
-import com.breadwallet.crypto.Network
-import com.breadwallet.crypto.NetworkPeer
-import com.breadwallet.crypto.Transfer
-import com.breadwallet.crypto.TransferDirection
-import com.breadwallet.crypto.Wallet
-import com.breadwallet.crypto.WalletManager
-import com.breadwallet.crypto.WalletManagerState
+import com.blockset.walletkit.Address
+import com.blockset.walletkit.Currency
+import com.blockset.walletkit.Network
+import com.blockset.walletkit.NetworkPeer
+import com.blockset.walletkit.Transfer
+import com.blockset.walletkit.TransferDirection
+import com.blockset.walletkit.Wallet
+import com.blockset.walletkit.WalletManager
+import com.blockset.walletkit.WalletManagerState
 import com.breadwallet.tools.util.BRConstants
 import com.breadwallet.util.isBitcoin
 import com.breadwallet.util.isBitcoinCash
+import com.breadwallet.util.isDoge
 import com.breadwallet.util.isEthereum
+import com.breadwallet.util.isLitecoin
 import com.breadwallet.util.isRipple
 import com.google.common.primitives.UnsignedInteger
 import kotlinx.coroutines.flow.Flow
@@ -148,6 +150,8 @@ val Wallet.urlScheme: String?
         currency.code.isEthereum() || currency.isErc20() -> "ethereum"
         currency.code.isRipple() -> "xrp"
         currency.code.isBitcoin() -> "bitcoin"
+        currency.code.isDoge() -> "dogecoin"
+        currency.code.isLitecoin() -> "litecoin"
         currency.code.isBitcoinCash() -> when {
             walletManager.network.isMainnet -> "bitcoincash"
             else -> "bchtest"

brd-android/app-core/src/main/java/com/breadwallet/breadbox/extensions.kt

@@ -8,13 +8,13 @@
  */
 package com.breadwallet.breadbox
 
-import com.breadwallet.crypto.*
-import com.breadwallet.crypto.Unit
-import com.breadwallet.crypto.errors.AccountInitializationError
-import com.breadwallet.crypto.errors.ExportablePaperWalletError
-import com.breadwallet.crypto.errors.FeeEstimationError
-import com.breadwallet.crypto.errors.LimitEstimationError
-import com.breadwallet.crypto.errors.WalletSweeperError
+import com.blockset.walletkit.*
+import com.blockset.walletkit.Unit
+import com.blockset.walletkit.errors.AccountInitializationError
+import com.blockset.walletkit.errors.ExportablePaperWalletError
+import com.blockset.walletkit.errors.FeeEstimationError
+import com.blockset.walletkit.errors.LimitEstimationError
+import com.blockset.walletkit.errors.WalletSweeperError
 import com.breadwallet.util.asyncApiCall
 import java.math.BigDecimal
 import java.math.RoundingMode

brd-android/app-core/src/main/java/com/breadwallet/legacy/presenter/customviews/BRButton.java

@@ -307,12 +307,9 @@ private void press(int duration) {
 
         ValueAnimator shadowAnim = ValueAnimator.ofFloat(SHADOW_UNPRESSED, SHADOW_PRESSED);
         shadowAnim.setDuration(duration);
-        shadowAnim.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
-            @Override
-            public void onAnimationUpdate(ValueAnimator animation) {
-                shadowOffSet = (float) animation.getAnimatedValue();
-                invalidate();
-            }
+        shadowAnim.addUpdateListener(animation -> {
+            shadowOffSet = (float) animation.getAnimatedValue();
+            invalidate();
         });
         shadowAnim.addListener(new ClearAnimationListener());
 
@@ -336,12 +333,9 @@ private void unPress(int duration) {
 
         ValueAnimator shadowAnim = ValueAnimator.ofFloat(SHADOW_PRESSED, SHADOW_UNPRESSED);
         shadowAnim.setDuration(duration);
-        shadowAnim.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
-            @Override
-            public void onAnimationUpdate(ValueAnimator animation) {
-                shadowOffSet = (float) animation.getAnimatedValue();
-                invalidate();
-            }
+        shadowAnim.addUpdateListener(animation -> {
+            shadowOffSet = (float) animation.getAnimatedValue();
+            invalidate();
         });
         shadowAnim.addListener(new ClearAnimationListener());
 

brd-android/app-core/src/main/java/com/breadwallet/legacy/presenter/entities/CurrencyEntity.kt

@@ -22,6 +22,6 @@ data class CurrencyEntity(
 
     companion object {
         const val serialVersionUID = 7526472295622776147L
-        val TAG = CurrencyEntity::class.java.name
+        val TAG: String = CurrencyEntity::class.java.name
     }
 }

brd-android/app-core/src/main/java/com/breadwallet/model/TokenItem.kt

@@ -10,14 +10,17 @@ package com.breadwallet.model
 
 import com.breadwallet.util.isBitcoin
 import com.breadwallet.util.isBitcoinCash
+import com.breadwallet.util.isDoge
 import com.breadwallet.util.isEthereum
+import com.breadwallet.util.isLitecoin
 import com.breadwallet.util.isRipple
 
 data class TokenItem(
     val address: String?,
     val symbol: String,
     val name: String,
     var image: String?,
+    var backgroundImage: String?,
     val isSupported: Boolean,
     val currencyId: String,
     val type: String = "",
@@ -26,12 +29,14 @@ data class TokenItem(
     val coingeckoId: String? = null
 ) {
 
-    val isNative: Boolean = type.isBlank()
+    val isNative: Boolean = type.isBlank() || type == "native"
 
-    fun urlScheme(testnet: Boolean): String? = when {
+    private fun urlScheme(testnet: Boolean): String? = when {
         symbol.isEthereum() || type == "erc20" -> "ethereum"
         symbol.isRipple() -> "xrp"
         symbol.isBitcoin() -> "bitcoin"
+        symbol.isDoge() -> "dogecoin"
+        symbol.isLitecoin() -> "litecoin"
         symbol.isBitcoinCash() -> when {
             testnet -> "bchtest"
             else -> "bitcoincash"

brd-android/app-core/src/main/java/com/breadwallet/platform/entities/WalletInfoData.kt

@@ -1,6 +1,6 @@
 package com.breadwallet.platform.entities
 
-import com.breadwallet.crypto.WalletManagerMode
+import com.blockset.walletkit.WalletManagerMode
 import com.breadwallet.logger.logError
 import com.platform.util.getIntOrDefault
 import com.platform.util.getLongOrDefault

brd-android/app-core/src/main/java/com/breadwallet/platform/interfaces/AccountMetaDataProvider.kt

@@ -12,9 +12,9 @@ import com.breadwallet.protocols.messageexchange.entities.PairingMetaData
 import kotlinx.coroutines.flow.Flow
 import com.breadwallet.platform.entities.TxMetaData
 import com.breadwallet.platform.entities.WalletInfoData
-import com.breadwallet.crypto.Account
-import com.breadwallet.crypto.Transfer
-import com.breadwallet.crypto.WalletManagerMode
+import com.blockset.walletkit.Account
+import com.blockset.walletkit.Transfer
+import com.blockset.walletkit.WalletManagerMode
 import com.breadwallet.platform.entities.TxMetaDataValue
 import java.util.Date