iOS Enable Babel fees after 5.0 activation

ergoplatform · Dec 6, 2022 · 42045fc · 42045fc
1 parent 5832d71
commit 42045fc
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 8 deletions.
diff --git a/common-jvm/build.gradle b/common-jvm/build.gradle
@@ -9,7 +9,7 @@ java {
 }
 
 dependencies {
-    api('org.ergoplatform:ergo-appkit_2.11:5.0.0') {
+    api('org.ergoplatform:ergo-appkit_2.11:db8c1cc8-SNAPSHOT') {
         exclude group: 'org.bouncycastle', module: 'bcprov-jdk15on'
         exclude group: 'org.bitbucket.inkytonik.kiama', module: 'kiama_2.11'
         exclude group: 'com.google.guava', module: 'guava'

diff --git a/common-jvm/src/main/java/org/ergoplatform/BabelFees.kt b/common-jvm/src/main/java/org/ergoplatform/BabelFees.kt
@@ -16,8 +16,6 @@ data class BabelSwapData(
 )
 
 object BabelFees {
-    var isEnabled = true
-
     fun findBabelBox(
         tokensToSend: List<ErgoToken>,
         tokenBalanceSenders: Map<String, WalletToken>,

diff --git a/common-jvm/src/main/java/org/ergoplatform/ErgoFacade.kt b/common-jvm/src/main/java/org/ergoplatform/ErgoFacade.kt
@@ -219,7 +219,6 @@ object ErgoFacade {
                 val babelSwap =
                     if (amountToSend <= Parameters.MinChangeValue && tokensToSend.isNotEmpty()
                         && babelAmount >= 0
-                        && BabelFees.isEnabled
                     )
                         BabelFees.findBabelBox(
                             tokensToSend,

diff --git a/ios/src/main/java/org/ergoplatform/ios/Main.kt b/ios/src/main/java/org/ergoplatform/ios/Main.kt
@@ -49,10 +49,6 @@ class Main : UIApplicationDelegateAdapter() {
         LogUtils.logDebug = !isErgoMainNet
         AesEncryptionManager.isOnLegacyApi = true
 
-        // FIXME Babel Fees iOS is enabled due to Java7 incompatibility. Recheck after 5.0
-        //  activation or robovm libcore 10 upgrade
-        BabelFees.isEnabled = false
-
         CrashHandler.registerUncaughtExceptionHandler()
         LogUtils.stackTraceLogger = { CrashHandler.writeToDebugFile(it) }
         database = SqlDelightAppDb(setupDatabase())