From 9b41b214469906b06cc406b5cf5e4e68198b5fbc Mon Sep 17 00:00:00 2001
From: polstianka <peer_id@yahoo.com>
Date: Sat, 19 Oct 2024 23:27:08 -0700
Subject: [PATCH] single base64 implementation for all app parts

---
 .idea/gradle.xml                              |  1 +
 .../src/main/java/com/tonapps/signer/App.kt   |  5 --
 .../tonapps/signer/screen/sign/SignArgs.kt    |  2 -
 .../main/java/com/tonapps/wallet/api/API.kt   |  8 --
 .../wallet/data/account/source/VaultSource.kt |  2 +-
 .../data/core/entity/RawMessageEntity.kt      |  6 +-
 apps/wallet/data/dapps/build.gradle.kts       |  1 +
 .../data/dapps/entities/AppConnectEntity.kt   | 30 +++++--
 apps/wallet/instance/app/build.gradle.kts     |  1 +
 .../manager/tonconnect/TonConnectManager.kt   |  1 +
 .../manager/tonconnect/bridge/Bridge.kt       | 12 ++-
 .../res/layout/fragment_main_events_list.xml  |  6 +-
 buildSrc/src/main/kotlin/Dependence.kt        |  1 +
 lib/base64/.gitignore                         |  1 +
 lib/base64/build.gradle.kts                   | 23 +++++
 lib/base64/src/main/AndroidManifest.xml       |  2 +
 .../main/java/com/tonapps/base64/Base64.kt    | 56 +++++++++++++
 .../main/java/com/tonapps/base64/Base64Url.kt | 62 ++++++++++++++
 .../java/com/tonapps/base64/Base64Utils.kt    | 14 ++++
 .../main/java/com/tonapps/base64/Encoding.kt  | 83 +++++++++++++++++++
 lib/blockchain/build.gradle.kts               |  1 +
 .../blockchain/ton/extensions/Base64.kt       | 11 ---
 .../tonapps/blockchain/ton/extensions/Cell.kt | 20 ++---
 .../ton/extensions/PublicKeyEd25519.kt        |  5 +-
 lib/extensions/build.gradle.kts               |  1 +
 .../java/com/tonapps/extensions/Base64.kt     |  9 --
 .../tonapps/extensions/SharedPreferences.kt   | 52 +++++++++++-
 lib/security/build.gradle.kts                 |  1 +
 .../java/com/tonapps/security/Extensions.kt   | 31 -------
 .../com/tonapps/security/vault/MasterKey.kt   |  4 +-
 .../com/tonapps/security/vault/PasswordKey.kt |  6 +-
 .../com/tonapps/security/vault/Storage.kt     |  4 +-
 settings.gradle.kts                           |  1 +
 33 files changed, 347 insertions(+), 116 deletions(-)
 create mode 100644 lib/base64/.gitignore
 create mode 100644 lib/base64/build.gradle.kts
 create mode 100644 lib/base64/src/main/AndroidManifest.xml
 create mode 100644 lib/base64/src/main/java/com/tonapps/base64/Base64.kt
 create mode 100644 lib/base64/src/main/java/com/tonapps/base64/Base64Url.kt
 create mode 100644 lib/base64/src/main/java/com/tonapps/base64/Base64Utils.kt
 create mode 100644 lib/base64/src/main/java/com/tonapps/base64/Encoding.kt
 delete mode 100644 lib/blockchain/src/main/java/com/tonapps/blockchain/ton/extensions/Base64.kt
 delete mode 100644 lib/extensions/src/main/java/com/tonapps/extensions/Base64.kt

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 431ed358a..411b4b9c7 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -58,6 +58,7 @@
             <option value="$PROJECT_DIR$/buildLogic/plugin" />
             <option value="$PROJECT_DIR$/buildSrc" />
             <option value="$PROJECT_DIR$/lib" />
+            <option value="$PROJECT_DIR$/lib/base64" />
             <option value="$PROJECT_DIR$/lib/blockchain" />
             <option value="$PROJECT_DIR$/lib/emoji" />
             <option value="$PROJECT_DIR$/lib/extensions" />
diff --git a/apps/signer/src/main/java/com/tonapps/signer/App.kt b/apps/signer/src/main/java/com/tonapps/signer/App.kt
index 95986ac02..2fd862965 100644
--- a/apps/signer/src/main/java/com/tonapps/signer/App.kt
+++ b/apps/signer/src/main/java/com/tonapps/signer/App.kt
@@ -10,11 +10,6 @@ import androidx.camera.core.CameraXConfig
 import com.tonapps.signer.screen.crash.CrashActivity
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.startKoin
-import org.ton.crypto.base64
-import com.tonapps.security.Security
-import java.io.PrintWriter
-import java.io.StringWriter
-
 
 class App: Application(), CameraXConfig.Provider {
 
diff --git a/apps/signer/src/main/java/com/tonapps/signer/screen/sign/SignArgs.kt b/apps/signer/src/main/java/com/tonapps/signer/screen/sign/SignArgs.kt
index 40e6f8817..fec19f1e0 100644
--- a/apps/signer/src/main/java/com/tonapps/signer/screen/sign/SignArgs.kt
+++ b/apps/signer/src/main/java/com/tonapps/signer/screen/sign/SignArgs.kt
@@ -1,9 +1,7 @@
 package com.tonapps.signer.screen.sign
 
 import android.os.Bundle
-import android.util.Log
 import com.tonapps.blockchain.ton.TonNetwork
-import com.tonapps.blockchain.ton.extensions.base64
 import com.tonapps.blockchain.ton.extensions.hex
 import com.tonapps.blockchain.ton.extensions.parseCell
 import com.tonapps.signer.Key
diff --git a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/API.kt b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/API.kt
index ceeb07fed..8fe3a0cfc 100644
--- a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/API.kt
+++ b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/API.kt
@@ -11,11 +11,8 @@ import com.tonapps.blockchain.ton.contract.BaseWalletContract
 import com.tonapps.blockchain.ton.contract.WalletVersion
 import com.tonapps.blockchain.ton.extensions.EmptyPrivateKeyEd25519
 import com.tonapps.blockchain.ton.extensions.base64
-import com.tonapps.blockchain.ton.extensions.equalsAddress
 import com.tonapps.blockchain.ton.extensions.isValidTonAddress
-import com.tonapps.blockchain.ton.extensions.toAccountId
 import com.tonapps.blockchain.ton.extensions.toRawAddress
-import com.tonapps.extensions.bestMessage
 import com.tonapps.extensions.locale
 import com.tonapps.extensions.toUriOrNull
 import com.tonapps.extensions.unicodeToPunycode
@@ -27,7 +24,6 @@ import com.tonapps.network.interceptor.AcceptLanguageInterceptor
 import com.tonapps.network.interceptor.AuthorizationInterceptor
 import com.tonapps.network.post
 import com.tonapps.network.postJSON
-import com.tonapps.network.simple
 import com.tonapps.network.sse
 import com.tonapps.wallet.api.core.SourceAPI
 import com.tonapps.wallet.api.entity.AccountDetailsEntity
@@ -42,7 +38,6 @@ import io.batteryapi.apis.BatteryApi
 import io.batteryapi.apis.BatteryApi.UnitsGetBalance
 import io.batteryapi.models.Balance
 import io.batteryapi.models.Config
-import io.batteryapi.models.PromoCodeBatteryPurchaseRequest
 import io.batteryapi.models.RechargeMethods
 import io.tonapi.infrastructure.ClientException
 import io.tonapi.infrastructure.Serializer
@@ -57,7 +52,6 @@ import io.tonapi.models.MessageConsequences
 import io.tonapi.models.NftItem
 import io.tonapi.models.SendBlockchainMessageRequest
 import io.tonapi.models.TokenRates
-import kotlinx.coroutines.CancellableContinuation
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -66,7 +60,6 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.withContext
-import kotlinx.serialization.json.Json
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -75,7 +68,6 @@ import okhttp3.Response
 import org.json.JSONArray
 import org.json.JSONObject
 import org.ton.api.pub.PublicKeyEd25519
-import org.ton.block.AddrStd
 import org.ton.cell.Cell
 import org.ton.crypto.hex
 import java.util.Locale
diff --git a/apps/wallet/data/account/src/main/java/com/tonapps/wallet/data/account/source/VaultSource.kt b/apps/wallet/data/account/src/main/java/com/tonapps/wallet/data/account/source/VaultSource.kt
index 7324260bb..346831b5e 100644
--- a/apps/wallet/data/account/src/main/java/com/tonapps/wallet/data/account/source/VaultSource.kt
+++ b/apps/wallet/data/account/src/main/java/com/tonapps/wallet/data/account/source/VaultSource.kt
@@ -4,9 +4,9 @@ import android.content.Context
 import androidx.core.content.edit
 import com.tonapps.blockchain.ton.extensions.hex
 import com.tonapps.extensions.getByteArray
+import com.tonapps.extensions.putByteArray
 import com.tonapps.security.Security
 import com.tonapps.security.clear
-import com.tonapps.security.putByteArray
 import org.ton.api.pk.PrivateKeyEd25519
 import org.ton.api.pub.PublicKeyEd25519
 import org.ton.mnemonic.Mnemonic
diff --git a/apps/wallet/data/core/src/main/java/com/tonapps/wallet/data/core/entity/RawMessageEntity.kt b/apps/wallet/data/core/src/main/java/com/tonapps/wallet/data/core/entity/RawMessageEntity.kt
index ae5ae49cb..aa0807bd0 100644
--- a/apps/wallet/data/core/src/main/java/com/tonapps/wallet/data/core/entity/RawMessageEntity.kt
+++ b/apps/wallet/data/core/src/main/java/com/tonapps/wallet/data/core/entity/RawMessageEntity.kt
@@ -56,11 +56,7 @@ data class RawMessageEntity(
         parseAmount(json.get("amount")),
         json.optString("stateInit"),
         json.optString("payload")
-    ) {
-        /*if (payload.base64() != payloadValue) {
-            throw IllegalStateException("Payload is not equal")
-        }*/
-    }
+    )
 
     private companion object {
 
diff --git a/apps/wallet/data/dapps/build.gradle.kts b/apps/wallet/data/dapps/build.gradle.kts
index 1bc9fa183..c70226c35 100644
--- a/apps/wallet/data/dapps/build.gradle.kts
+++ b/apps/wallet/data/dapps/build.gradle.kts
@@ -18,4 +18,5 @@ dependencies {
     implementation(project(Dependence.Lib.sqlite))
     implementation(project(Dependence.Lib.security))
     implementation(project(Dependence.Lib.network))
+    implementation(project(Dependence.Lib.base64))
 }
\ No newline at end of file
diff --git a/apps/wallet/data/dapps/src/main/java/com/tonapps/wallet/data/dapps/entities/AppConnectEntity.kt b/apps/wallet/data/dapps/src/main/java/com/tonapps/wallet/data/dapps/entities/AppConnectEntity.kt
index 9a63ad12f..c4ff195f6 100644
--- a/apps/wallet/data/dapps/src/main/java/com/tonapps/wallet/data/dapps/entities/AppConnectEntity.kt
+++ b/apps/wallet/data/dapps/src/main/java/com/tonapps/wallet/data/dapps/entities/AppConnectEntity.kt
@@ -1,7 +1,9 @@
 package com.tonapps.wallet.data.dapps.entities
 
 import android.net.Uri
-import com.tonapps.extensions.base64
+import android.util.Base64
+import android.util.Log
+import com.tonapps.base64.decodeBase64
 import com.tonapps.security.CryptoBox
 import com.tonapps.security.Sodium
 import com.tonapps.security.hex
@@ -31,6 +33,9 @@ data class AppConnectEntity(
             localPrivateKey: ByteArray,
             body: ByteArray
         ): ByteArray {
+            Log.d("AppConnectEntityLog", "encryptMessage: remotePublicKey = ${remotePublicKey.joinToString()}")
+            Log.d("AppConnectEntityLog", "encryptMessage: localPrivateKey = ${localPrivateKey.joinToString()}")
+            Log.d("AppConnectEntityLog", "encryptMessage: body = ${body.toString(Charsets.UTF_8)}")
             val nonce = CryptoBox.nonce()
             val cipher = ByteArray(body.size + Sodium.cryptoBoxMacBytes())
             Sodium.cryptoBoxEasy(cipher, body, body.size, nonce, remotePublicKey, localPrivateKey)
@@ -43,8 +48,11 @@ data class AppConnectEntity(
             body: ByteArray
         ): ByteArray {
             val nonce = body.sliceArray(0 until Sodium.cryptoBoxNonceBytes())
+            Log.d("AppConnectEntityLog", "nonce = ${nonce.joinToString()}")
             val cipher = body.sliceArray(Sodium.cryptoBoxNonceBytes() until body.size)
+            Log.d("AppConnectEntityLog", "cipher = ${cipher.joinToString()}")
             val message = ByteArray(cipher.size - Sodium.cryptoBoxMacBytes())
+            Log.d("AppConnectEntityLog", "message = ${message.joinToString()}")
             Sodium.cryptoBoxOpenEasy(message, cipher, cipher.size, nonce, remotePublicKey, localPrivateKey)
             return message
         }
@@ -54,17 +62,21 @@ data class AppConnectEntity(
         hex(keyPair.publicKey)
     }
 
-    fun encryptMessage(body: ByteArray): ByteArray {
-        return encryptMessage(clientId.hex(), keyPair.privateKey, body)
-    }
-
     fun decryptMessage(body: ByteArray): ByteArray {
         return decryptMessage(clientId.hex(), keyPair.privateKey, body)
     }
 
-    fun decryptEventMessage(message: String): JSONObject {
-        val bytes = message.base64
-        val decrypted = decryptMessage(bytes)
-        return JSONObject(decrypted.toString(Charsets.UTF_8))
+    fun decryptEventMessage(message: String): JSONObject? {
+        try {
+            Log.d("AppConnectEntityLog", "decryptEventMessage: message = \"$message\"")
+            val bytes = message.decodeBase64()
+            Log.d("AppConnectEntityLog", "decryptEventMessage: bytes = ${bytes.joinToString()}")
+            val decrypted = decryptMessage(bytes)
+            Log.d("AppConnectEntityLog", "decryptEventMessage: decrypted = ${decrypted.joinToString()}")
+            return JSONObject(decrypted.toString(Charsets.UTF_8))
+        } catch (e: Throwable) {
+            Log.e("AppConnectEntityLog", "decryptEventMessage: ", e)
+            return null
+        }
     }
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/build.gradle.kts b/apps/wallet/instance/app/build.gradle.kts
index 86d98bf40..a1d0120aa 100644
--- a/apps/wallet/instance/app/build.gradle.kts
+++ b/apps/wallet/instance/app/build.gradle.kts
@@ -103,6 +103,7 @@ dependencies {
     implementation(project(Dependence.Lib.extensions))
     implementation(project(Dependence.Lib.ledger))
     implementation(project(Dependence.Lib.ur))
+    implementation(project(Dependence.Lib.base64))
 
     implementation(Dependence.AndroidX.Camera.base)
     implementation(Dependence.AndroidX.Camera.core)
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/manager/tonconnect/TonConnectManager.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/manager/tonconnect/TonConnectManager.kt
index bbe2f5535..8273b32d6 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/manager/tonconnect/TonConnectManager.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/manager/tonconnect/TonConnectManager.kt
@@ -295,6 +295,7 @@ class TonConnectManager(
         } catch (e: ManifestException) {
             JsonBuilder.connectEventError(BridgeError.resolve(e))
         } catch (e: Throwable) {
+            Log.e("AppConnectEntityLog", "Error TONConnect", e)
             JsonBuilder.connectEventError(BridgeError.UNKNOWN)
         }
     }
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/manager/tonconnect/bridge/Bridge.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/manager/tonconnect/bridge/Bridge.kt
index 17c241c42..d3f2d8a23 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/manager/tonconnect/bridge/Bridge.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/manager/tonconnect/bridge/Bridge.kt
@@ -1,7 +1,8 @@
 package com.tonapps.tonkeeper.manager.tonconnect.bridge
 
+import android.util.Log
 import com.google.firebase.crashlytics.FirebaseCrashlytics
-import com.tonapps.extensions.base64
+import com.tonapps.base64.encodeBase64
 import com.tonapps.extensions.optStringCompat
 import com.tonapps.security.CryptoBox
 import com.tonapps.security.hex
@@ -11,6 +12,7 @@ import com.tonapps.wallet.api.API
 import com.tonapps.wallet.data.dapps.entities.AppConnectEntity
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.withContext
 
@@ -69,7 +71,7 @@ internal class Bridge(private val api: API) {
     ): Boolean = withContext(Dispatchers.IO) {
         try {
             val encryptedMessage = AppConnectEntity.encryptMessage(clientId.hex(), keyPair.privateKey, unencryptedMessage.toByteArray())
-            api.tonconnectSend(hex(keyPair.publicKey), clientId, encryptedMessage.base64)
+            api.tonconnectSend(hex(keyPair.publicKey), clientId, encryptedMessage.encodeBase64())
             true
         } catch (e: Throwable) {
             FirebaseCrashlytics.getInstance().recordException(e)
@@ -88,12 +90,16 @@ internal class Bridge(private val api: API) {
                 val from = event.json.optStringCompat("from") ?: return@mapNotNull null
                 val message = event.json.optStringCompat("message") ?: return@mapNotNull null
                 val connection = connections.find { it.clientId == from } ?: return@mapNotNull null
-                val decryptedMessage = BridgeEvent.Message(connection.decryptEventMessage(message))
+                val json = connection.decryptEventMessage(message) ?: return@mapNotNull null
+                val decryptedMessage = BridgeEvent.Message(json)
                 BridgeEvent(
                     eventId = id,
                     message = decryptedMessage,
                     connection = connection.copy(),
                 )
+            }.catch {
+                Log.e("AppConnectEntityLog", "eventsFlow: ", it)
+                FirebaseCrashlytics.getInstance().recordException(it)
             }
     }
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/layout/fragment_main_events_list.xml b/apps/wallet/instance/app/src/main/res/layout/fragment_main_events_list.xml
index 192985fb5..2a10ed81a 100644
--- a/apps/wallet/instance/app/src/main/res/layout/fragment_main_events_list.xml
+++ b/apps/wallet/instance/app/src/main/res/layout/fragment_main_events_list.xml
@@ -13,9 +13,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:paddingHorizontal="@dimen/offsetMedium"
-            android:clipToPadding="false"/>
-
-        <!--android:topOffset="112dp" -->
+            android:clipToPadding="false"
+            android:topOffset="112dp"/>
 
     </com.tonapps.tonkeeper.ui.component.MainSwipeRefreshLayout>
 
@@ -44,7 +43,6 @@
             android:id="@+id/filters"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:visibility="gone"
             android:paddingBottom="16dp"
             android:paddingHorizontal="@dimen/offsetMedium"/>
 
diff --git a/buildSrc/src/main/kotlin/Dependence.kt b/buildSrc/src/main/kotlin/Dependence.kt
index 467ec8bae..8c384b084 100644
--- a/buildSrc/src/main/kotlin/Dependence.kt
+++ b/buildSrc/src/main/kotlin/Dependence.kt
@@ -117,6 +117,7 @@ object Dependence {
         const val sqlite = ":lib:sqlite"
         const val ledger = ":lib:ledger"
         const val ur = ":lib:ur"
+        const val base64 = ":lib:base64"
     }
 
     object UIKit {
diff --git a/lib/base64/.gitignore b/lib/base64/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/lib/base64/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/lib/base64/build.gradle.kts b/lib/base64/build.gradle.kts
new file mode 100644
index 000000000..7e7caa4bd
--- /dev/null
+++ b/lib/base64/build.gradle.kts
@@ -0,0 +1,23 @@
+plugins {
+    id("com.android.library")
+    id("org.jetbrains.kotlin.android")
+}
+
+android {
+    namespace = Build.namespacePrefix("base64")
+    compileSdk = Build.compileSdkVersion
+
+    defaultConfig {
+        minSdk = Build.minSdkVersion
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
diff --git a/lib/base64/src/main/AndroidManifest.xml b/lib/base64/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..1d26c87a1
--- /dev/null
+++ b/lib/base64/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest/>
\ No newline at end of file
diff --git a/lib/base64/src/main/java/com/tonapps/base64/Base64.kt b/lib/base64/src/main/java/com/tonapps/base64/Base64.kt
new file mode 100644
index 000000000..b7012d103
--- /dev/null
+++ b/lib/base64/src/main/java/com/tonapps/base64/Base64.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2022 Sascha Peilicke <sascha@peilicke.de>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.tonapps.base64
+
+/**
+ * Encode a [String] to Base64 standard encoded [String].
+ *
+ * See [RFC 4648 §4](https://datatracker.ietf.org/doc/html/rfc4648#section-4)
+ */
+val String.base64Encoded: String
+    get() = encodeInternal(Encoding.Standard)
+
+/**
+ * Encode a [ByteArray] to Base64 standard encoded [String].
+ *
+ * See [RFC 4648 §4](https://datatracker.ietf.org/doc/html/rfc4648#section-4)
+ */
+val ByteArray.base64Encoded: String
+    get() = asCharArray().concatToString().base64Encoded
+
+/**
+ * Decode a Base64 standard encoded [String] to [String].
+ *
+ * See [RFC 4648 §4](https://datatracker.ietf.org/doc/html/rfc4648#section-4)
+ */
+val String.base64Decoded: String
+    get() = decodeInternal(Encoding.Standard).map { it.toChar() }.joinToString("").dropLast(count { it == '=' })
+
+/**
+ * Decode a Base64 standard encoded [String] to [ByteArray].
+ *
+ * See [RFC 4648 §4](https://datatracker.ietf.org/doc/html/rfc4648#section-4)
+ */
+val String.base64DecodedBytes: ByteArray
+    get() = decodeInternal(Encoding.Standard).map { it.toByte() }.toList().dropLast(count { it == '=' }).toByteArray()
+
+/**
+ * Decode a Base64 standard encoded [ByteArray] to [String].
+ *
+ * See [RFC 4648 §4](https://datatracker.ietf.org/doc/html/rfc4648#section-4)
+ */
+val ByteArray.base64Decoded: String
+    get() = asCharArray().concatToString().base64Decoded
\ No newline at end of file
diff --git a/lib/base64/src/main/java/com/tonapps/base64/Base64Url.kt b/lib/base64/src/main/java/com/tonapps/base64/Base64Url.kt
new file mode 100644
index 000000000..cc86a9615
--- /dev/null
+++ b/lib/base64/src/main/java/com/tonapps/base64/Base64Url.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2022 Sascha Peilicke <sascha@peilicke.de>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.tonapps.base64
+
+/**
+ * Encode a [String] to Base64 URL-safe encoded [String].
+ *
+ * See [RFC 4648 §5](https://datatracker.ietf.org/doc/html/rfc4648#section-5)
+ */
+val String.base64UrlEncoded: String
+    get() = encodeInternal(Encoding.UrlSafe)
+
+/**
+ * Encode a [ByteArray] to Base64 URL-safe encoded [String].
+ *
+ * See [RFC 4648 §5](https://datatracker.ietf.org/doc/html/rfc4648#section-5)
+ */
+val ByteArray.base64UrlEncoded: String
+    get() = asCharArray().concatToString().base64UrlEncoded
+
+/**
+ * Decode a Base64 URL-safe encoded [String] to [String].
+ *
+ * See [RFC 4648 §5](https://datatracker.ietf.org/doc/html/rfc4648#section-5)
+ */
+val String.base64UrlDecoded: String
+    get() {
+        val ret = decodeInternal(Encoding.UrlSafe).map { it.toChar() }
+        val foo = ret.joinToString("")
+        val bar = foo.dropLast(count { it == '=' })
+        return bar.filterNot { it.code == 0 }
+    }
+
+/**
+ * Decode a Base64 URL-safe encoded [String] to [ByteArray].
+ *
+ * See [RFC 4648 §5](https://datatracker.ietf.org/doc/html/rfc4648#section-5)
+ */
+/*val String.base64UrlDecodedBytes: ByteArray
+    get() = decodeInternal(Encoding.UrlSafe)
+        .map { it.toByte() }.toList().dropLast(count { it == '=' || it == '' }).toByteArray()*/
+
+/**
+ * Decode a Base64 URL-safe encoded [ByteArray] to [String].
+ *
+ * See [RFC 4648 §5](https://datatracker.ietf.org/doc/html/rfc4648#section-5)
+ */
+val ByteArray.base64UrlDecoded: String
+    get() = asCharArray().concatToString().base64UrlDecoded
\ No newline at end of file
diff --git a/lib/base64/src/main/java/com/tonapps/base64/Base64Utils.kt b/lib/base64/src/main/java/com/tonapps/base64/Base64Utils.kt
new file mode 100644
index 000000000..04f194ebf
--- /dev/null
+++ b/lib/base64/src/main/java/com/tonapps/base64/Base64Utils.kt
@@ -0,0 +1,14 @@
+package com.tonapps.base64
+
+fun String.decodeBase64(): ByteArray {
+    //force non-url safe and add padding so that it can be applied to all b64 formats
+    val replaced = trim()
+        .replace('-', '+')
+        .replace('_', '/')
+        .replace("%3d", "=")
+    return replaced.base64DecodedBytes
+}
+
+fun ByteArray.encodeBase64(): String {
+    return base64Encoded
+}
diff --git a/lib/base64/src/main/java/com/tonapps/base64/Encoding.kt b/lib/base64/src/main/java/com/tonapps/base64/Encoding.kt
new file mode 100644
index 000000000..981894774
--- /dev/null
+++ b/lib/base64/src/main/java/com/tonapps/base64/Encoding.kt
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2022 Sascha Peilicke <sascha@peilicke.de>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.tonapps.base64
+
+/**
+ * Base64 encoding scheme
+ */
+internal sealed interface Encoding {
+    val alphabet: String
+    val requiresPadding: Boolean
+
+    data object Standard : Encoding {
+        override val alphabet: String = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
+        override val requiresPadding: Boolean = true
+    }
+
+    data object UrlSafe : Encoding {
+        override val alphabet: String = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"
+        override val requiresPadding: Boolean = false // Padding is optional
+    }
+}
+
+internal fun String.encodeInternal(encoding: Encoding): String {
+    val padLength = when (length % 3) {
+        1 -> 2
+        2 -> 1
+        else -> 0
+    }
+    val raw = this + 0.toChar().toString().repeat(maxOf(0, padLength))
+    val encoded = raw.chunkedSequence(3) {
+        Triple(it[0].code, it[1].code, it[2].code)
+    }.map { (first, second, third) ->
+        (0xFF.and(first) shl 16) + (0xFF.and(second) shl 8) + 0xFF.and(third)
+    }.map { n ->
+        sequenceOf((n shr 18) and 0x3F, (n shr 12) and 0x3F, (n shr 6) and 0x3F, n and 0x3F)
+    }.flatten()
+        .map { encoding.alphabet[it] }
+        .joinToString("")
+        .dropLast(padLength)
+    return when (encoding.requiresPadding) {
+        true -> encoded.padEnd(encoded.length + padLength, '=')
+        else -> encoded
+    }
+}
+
+internal fun String.decodeInternal(encoding: Encoding): Sequence<Int> {
+    val padLength = when (length % 4) {
+        1 -> 3
+        2 -> 2
+        3 -> 1
+        else -> 0
+    }
+    return padEnd(length + padLength, '=')
+        .replace("=", "A")
+        .chunkedSequence(4) {
+            (encoding.alphabet.indexOf(it[0]) shl 18) + (encoding.alphabet.indexOf(it[1]) shl 12) +
+                    (encoding.alphabet.indexOf(it[2]) shl 6) + encoding.alphabet.indexOf(it[3])
+        }
+        .map { sequenceOf(0xFF.and(it shr 16), 0xFF.and(it shr 8), 0xFF.and(it)) }
+        .flatten()
+}
+
+internal fun ByteArray.asCharArray(): CharArray {
+    val chars = CharArray(size)
+    for (i in chars.indices) {
+        chars[i] = get(i).toInt().toChar()
+    }
+    return chars
+}
\ No newline at end of file
diff --git a/lib/blockchain/build.gradle.kts b/lib/blockchain/build.gradle.kts
index 99ef105c5..2d7f8d69e 100644
--- a/lib/blockchain/build.gradle.kts
+++ b/lib/blockchain/build.gradle.kts
@@ -26,4 +26,5 @@ dependencies {
     api(Dependence.ton)
     api(Dependence.KotlinX.io)
     implementation(project(Dependence.Lib.extensions))
+    implementation(project(Dependence.Lib.base64))
 }
\ No newline at end of file
diff --git a/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/extensions/Base64.kt b/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/extensions/Base64.kt
deleted file mode 100644
index 90c0cd80b..000000000
--- a/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/extensions/Base64.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.tonapps.blockchain.ton.extensions
-
-import io.ktor.util.decodeBase64Bytes
-
-fun String.fixedBase64(): String {
-    return this.trim().replace(" ", "+")
-}
-
-fun String.base64(): ByteArray {
-    return fixedBase64().decodeBase64Bytes()
-}
\ No newline at end of file
diff --git a/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/extensions/Cell.kt b/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/extensions/Cell.kt
index df8fff9dd..793057a58 100644
--- a/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/extensions/Cell.kt
+++ b/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/extensions/Cell.kt
@@ -1,25 +1,20 @@
 package com.tonapps.blockchain.ton.extensions
 
+import com.tonapps.base64.decodeBase64
+import com.tonapps.base64.encodeBase64
 import org.json.JSONObject
 import org.ton.bitstring.BitString
 import org.ton.boc.BagOfCells
 import org.ton.cell.Cell
 import org.ton.cell.CellSlice
 import org.ton.crypto.hex
-import kotlin.io.encoding.Base64
-import kotlin.io.encoding.ExperimentalEncodingApi
 
-@OptIn(ExperimentalEncodingApi::class)
 fun String.toBoc(): BagOfCells {
-    /*if (startsWith("{")) { // oh fuck....
+    if (startsWith("{")) { // oh fuck....
         return toBocFromJSBuffer()
-    }*/
+    }
     return try {
-        /*val bytes = Base64.Default.Mime.decode(this)
-        return BagOfCells(bytes)*/
-        val fixedBoc = this.replace("-", "+")
-            .replace("_", "/")
-        BagOfCells(fixedBoc.base64())
+        BagOfCells(decodeBase64())
     } catch (e: Throwable) {
         BagOfCells(hex(this))
     }
@@ -54,11 +49,8 @@ fun Cell.toByteArray(): ByteArray {
     return BagOfCells(this).toByteArray()
 }
 
-@OptIn(ExperimentalEncodingApi::class)
 fun Cell.base64(): String {
-    /*val bytes = toByteArray()
-    return Base64.Default.Mime.encode(bytes)*/
-    return org.ton.crypto.base64(toByteArray())
+    return toByteArray().encodeBase64()
 }
 
 fun Cell.hex(): String {
diff --git a/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/extensions/PublicKeyEd25519.kt b/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/extensions/PublicKeyEd25519.kt
index 23d597265..88afa0a2e 100644
--- a/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/extensions/PublicKeyEd25519.kt
+++ b/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/extensions/PublicKeyEd25519.kt
@@ -1,14 +1,15 @@
 package com.tonapps.blockchain.ton.extensions
 
+import com.tonapps.base64.decodeBase64
 import org.ton.api.pub.PublicKeyEd25519
 import org.ton.crypto.base64
 import org.ton.crypto.hex
 
 fun String.publicKey(): PublicKeyEd25519 {
     return try {
-        PublicKeyEd25519(base64())
-    } catch (e: Throwable) {
         PublicKeyEd25519(hex(this))
+    } catch (e: Throwable) {
+        PublicKeyEd25519(decodeBase64())
     }
 }
 
diff --git a/lib/extensions/build.gradle.kts b/lib/extensions/build.gradle.kts
index 9a0cf92a2..f660077f3 100644
--- a/lib/extensions/build.gradle.kts
+++ b/lib/extensions/build.gradle.kts
@@ -29,5 +29,6 @@ dependencies {
     implementation(Dependence.AndroidX.security)
     implementation(project(Dependence.UIKit.core))
     implementation(project(Dependence.Lib.icu))
+    implementation(project(Dependence.Lib.base64))
     implementation("com.google.android.gms:play-services-base:18.5.0")
 }
diff --git a/lib/extensions/src/main/java/com/tonapps/extensions/Base64.kt b/lib/extensions/src/main/java/com/tonapps/extensions/Base64.kt
deleted file mode 100644
index de98a0bca..000000000
--- a/lib/extensions/src/main/java/com/tonapps/extensions/Base64.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.tonapps.extensions
-
-import android.util.Base64
-
-val String.base64: ByteArray
-    get() = Base64.decode(this, Base64.DEFAULT)
-
-val ByteArray.base64: String
-    get() = Base64.encodeToString(this, Base64.DEFAULT)
\ No newline at end of file
diff --git a/lib/extensions/src/main/java/com/tonapps/extensions/SharedPreferences.kt b/lib/extensions/src/main/java/com/tonapps/extensions/SharedPreferences.kt
index 583b04843..0c9ac8bc8 100644
--- a/lib/extensions/src/main/java/com/tonapps/extensions/SharedPreferences.kt
+++ b/lib/extensions/src/main/java/com/tonapps/extensions/SharedPreferences.kt
@@ -2,28 +2,72 @@ package com.tonapps.extensions
 
 import android.content.SharedPreferences
 import android.os.Parcelable
-import android.util.Log
 import androidx.core.content.edit
-import androidx.core.os.BundleCompat
+import com.tonapps.base64.decodeBase64
+import com.tonapps.base64.encodeBase64
 
 fun SharedPreferences.getByteArray(key: String): ByteArray? {
-    val bytes = getString(key, null)?.base64 ?: return null
+    val value = getString(key, null)?.trim() ?: return null
+    val bytes = value.decodeBase64()
     if (bytes.isEmpty()) {
         return null
     }
     return bytes
 }
 
+/*
+fun SharedPreferences.getByteArray(key: String): ByteArray? {
+    val value = run {
+        val value = getString(key, null)
+        if (value.isNullOrBlank()) {
+            return byteArrayOf(0)
+        }
+        base64(value) ?: byteArrayOf(0)
+    }
+
+    if (value.isZero()) {
+        value.clear()
+        return null
+    }
+    return value
+}
+
+fun SharedPreferences.Editor.putByteArray(key: String, value: ByteArray): SharedPreferences.Editor {
+    if (value.isZero()) {
+        remove(key)
+        return this
+    } else {
+        val string = base64(value)
+        if (string == null) {
+            remove(key)
+        } else {
+            putString(key, string)
+        }
+    }
+    return this
+}
+
+ */
+
 fun SharedPreferences.putByteArray(key: String, value: ByteArray?) {
     if (value == null) {
         remove(key)
     } else {
         edit {
-            putString(key, value.base64)
+            putByteArray(key, value)
         }
     }
 }
 
+fun SharedPreferences.Editor.putByteArray(key: String, value: ByteArray?): SharedPreferences.Editor {
+    if (value == null) {
+        remove(key)
+    } else {
+        putString(key, value.encodeBase64())
+    }
+    return this
+}
+
 fun SharedPreferences.getIntArray(key: String): IntArray? {
     if (!contains(key)) {
         return null
diff --git a/lib/security/build.gradle.kts b/lib/security/build.gradle.kts
index 9a039be48..7e9bd1a8e 100644
--- a/lib/security/build.gradle.kts
+++ b/lib/security/build.gradle.kts
@@ -42,6 +42,7 @@ android {
 dependencies {
     implementation(Dependence.KotlinX.coroutines)
     implementation(Dependence.AndroidX.security)
+    implementation(project(Dependence.Lib.extensions))
     compileOnly(fileTree("libs") {
         include("*.aar")
     })
diff --git a/lib/security/src/main/java/com/tonapps/security/Extensions.kt b/lib/security/src/main/java/com/tonapps/security/Extensions.kt
index 8d277be61..263391730 100644
--- a/lib/security/src/main/java/com/tonapps/security/Extensions.kt
+++ b/lib/security/src/main/java/com/tonapps/security/Extensions.kt
@@ -87,37 +87,6 @@ fun base64(input: ByteArray): String? {
     }
 }
 
-fun SharedPreferences.getByteArray(key: String): ByteArray? {
-    val value = run {
-        val value = getString(key, null)
-        if (value.isNullOrBlank()) {
-            return byteArrayOf(0)
-        }
-        base64(value) ?: byteArrayOf(0)
-    }
-
-    if (value.isZero()) {
-        value.clear()
-        return null
-    }
-    return value
-}
-
-fun SharedPreferences.Editor.putByteArray(key: String, value: ByteArray): SharedPreferences.Editor {
-    if (value.isZero()) {
-        remove(key)
-        return this
-    } else {
-        val string = base64(value)
-        if (string == null) {
-            remove(key)
-        } else {
-            putString(key, string)
-        }
-    }
-    return this
-}
-
 fun hex(bytes: ByteArray): String = buildString(bytes.size * 2) {
     bytes.forEach { byte ->
         val b = byte.toInt() and 0xFF
diff --git a/lib/security/src/main/java/com/tonapps/security/vault/MasterKey.kt b/lib/security/src/main/java/com/tonapps/security/vault/MasterKey.kt
index fb80099e6..645a834ee 100644
--- a/lib/security/src/main/java/com/tonapps/security/vault/MasterKey.kt
+++ b/lib/security/src/main/java/com/tonapps/security/vault/MasterKey.kt
@@ -2,12 +2,12 @@ package com.tonapps.security.vault
 
 import android.annotation.SuppressLint
 import android.content.SharedPreferences
+import com.tonapps.extensions.getByteArray
+import com.tonapps.extensions.putByteArray
 import com.tonapps.security.Security
 import com.tonapps.security.clear
 import com.tonapps.security.decrypt
 import com.tonapps.security.encrypt
-import com.tonapps.security.getByteArray
-import com.tonapps.security.putByteArray
 import com.tonapps.security.safeDestroy
 import com.tonapps.security.spec.SimpleSecretSpec
 import javax.crypto.SecretKey
diff --git a/lib/security/src/main/java/com/tonapps/security/vault/PasswordKey.kt b/lib/security/src/main/java/com/tonapps/security/vault/PasswordKey.kt
index bdec9451b..e80819e0b 100644
--- a/lib/security/src/main/java/com/tonapps/security/vault/PasswordKey.kt
+++ b/lib/security/src/main/java/com/tonapps/security/vault/PasswordKey.kt
@@ -2,13 +2,11 @@ package com.tonapps.security.vault
 
 import android.annotation.SuppressLint
 import android.content.SharedPreferences
-import android.util.Log
+import com.tonapps.extensions.getByteArray
+import com.tonapps.extensions.putByteArray
 import com.tonapps.security.spec.SimpleSecretSpec
 import com.tonapps.security.Security
 import com.tonapps.security.clear
-import com.tonapps.security.getByteArray
-import com.tonapps.security.hex
-import com.tonapps.security.putByteArray
 import com.tonapps.security.safeDestroy
 import java.security.MessageDigest
 import javax.crypto.SecretKey
diff --git a/lib/security/src/main/java/com/tonapps/security/vault/Storage.kt b/lib/security/src/main/java/com/tonapps/security/vault/Storage.kt
index b1467d637..5b36a4720 100644
--- a/lib/security/src/main/java/com/tonapps/security/vault/Storage.kt
+++ b/lib/security/src/main/java/com/tonapps/security/vault/Storage.kt
@@ -2,12 +2,12 @@ package com.tonapps.security.vault
 
 import android.annotation.SuppressLint
 import android.content.SharedPreferences
+import com.tonapps.extensions.getByteArray
+import com.tonapps.extensions.putByteArray
 import com.tonapps.security.Security
 import com.tonapps.security.clear
 import com.tonapps.security.decrypt
 import com.tonapps.security.encrypt
-import com.tonapps.security.getByteArray
-import com.tonapps.security.putByteArray
 import javax.crypto.SecretKey
 
 internal class Storage(
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 5b510a3e5..67feba49b 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -48,6 +48,7 @@ include(":lib:blockchain")
 include(":lib:sqlite")
 include(":lib:ledger")
 include(":lib:ur")
+include(":lib:base64")
 
 
 include(":apps:wallet:instance:app")