diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/solana/transaction/RealSolanaTransactionService.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/solana/transaction/RealSolanaTransactionService.kt
index 33f984fe..8af3f519 100644
--- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/solana/transaction/RealSolanaTransactionService.kt
+++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/solana/transaction/RealSolanaTransactionService.kt
@@ -20,7 +20,6 @@ import io.novafoundation.nova.feature_wallet_impl.data.network.solana.SolanaApi
 import io.novafoundation.nova.runtime.ext.commissionAsset
 import io.novafoundation.nova.runtime.ext.requireSolanaRpcBaseUrl
 import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain
-import io.novasama.substrate_sdk_android.runtime.AccountId
 import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignerPayloadRaw
 import java.math.BigInteger
 
diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/ext/ChainExt.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/ext/ChainExt.kt
index 54e21ad2..97a1d7e7 100644
--- a/runtime/src/main/java/io/novafoundation/nova/runtime/ext/ChainExt.kt
+++ b/runtime/src/main/java/io/novafoundation/nova/runtime/ext/ChainExt.kt
@@ -20,10 +20,14 @@ import io.novafoundation.nova.common.utils.findIsInstanceOrNull
 import io.novafoundation.nova.common.utils.formatNamed
 import io.novafoundation.nova.common.utils.isValidBitcoinDestinationAddress
 import io.novafoundation.nova.common.utils.removeHexPrefix
+import io.novafoundation.nova.common.utils.emptySolanaAccountId
 import io.novafoundation.nova.common.utils.emptyTronAccountId
+import io.novafoundation.nova.common.utils.isValidSolanaAddress
 import io.novafoundation.nova.common.utils.isValidTronAddress
+import io.novafoundation.nova.common.utils.solanaAddressToAccountId
 import io.novafoundation.nova.common.utils.substrateAccountId
 import io.novafoundation.nova.common.utils.toBitcoinAddress
+import io.novafoundation.nova.common.utils.toSolanaAddress
 import io.novafoundation.nova.common.utils.toTronAddress
 import io.novafoundation.nova.common.utils.tronAddressToAccountId
 import io.novafoundation.nova.common.utils.tronPublicKeyToAccountId