Add minimum amount on swap. Integrate tron to walletconnect.

Author: furenster

app/src/main/assets/swap/okx.svg

@@ -123,32 +123,21 @@ class MainViewModel @Inject constructor(
     }
 
 
-    suspend fun onWallet(walletIndex: Int, walletId: String) {
+    suspend fun onWallet(walletId: String) {
         walletId.takeIf { it.isNotEmpty() }?.let { walletId ->
             if (sessionRepository.session().firstOrNull()?.wallet?.id != walletId) {
                 walletsRepository.getAll().firstOrNull()?.firstOrNull { it.id == walletId }?.let {
                     sessionRepository.setWallet(it)
                 }
             }
         }
-        walletIndex.takeIf { it > 0 }?.let { walletIndex -> // TODO: WalletID Migration remove when back will ready
-            if (sessionRepository.session().firstOrNull()?.wallet?.index != walletIndex) {
-                walletsRepository.getAll().firstOrNull()?.firstOrNull { it.index == walletIndex }?.let {
-                    sessionRepository.setWallet(it)
-                }
-            }
-        }
     }
 
     fun handleIntent(intent: Intent) = viewModelScope.launch(Dispatchers.IO) {
         // Handle push notification if app in background or unloaded
         val intent = if (intent.hasExtra("walletId")) {
             val walletId = intent.getStringExtra("walletId") ?: ""
-            onWallet(-1, walletId)
-            intent
-        } else if (intent.hasExtra("walletIndex")) { // TODO: WalletID Migration remove when back will ready
-            val walletIndex = intent.getIntExtra("walletIndex", -1)
-            onWallet(walletIndex, "")
+            onWallet(walletId)
             intent
         } else if (intent.extras != null) {
             val data = parseNotificationData(
@@ -166,7 +155,7 @@ class MainViewModel @Inject constructor(
                     }
 
                     is PushNotificationData.Transaction -> {
-                        onWallet(data.walletIndex, data.walletId)
+                        onWallet(data.walletId)
                         Intent().apply {
                             setData("${assetRouteUri}/${data.assetId}".toUri())
                         }

app/src/main/kotlin/com/gemwallet/android/MainViewModel.kt

@@ -48,7 +48,7 @@ class ShowSystemNotification @Inject constructor(@ApplicationContext val applica
         data: PushNotificationData.Transaction
     ) {
         val extra = Bundle().apply {
-            putInt("walletIndex", data.walletIndex)
+            putString("walletId", data.walletId)
         }
         showNotification(title, subtitle, channelId, extra, "${assetRouteUri}/${data.assetId}".toUri())
     }

app/src/main/kotlin/com/gemwallet/android/services/ShowSystemNotification.kt

@@ -1,7 +1,9 @@
 package com.gemwallet.android.blockchain.clients.tron
 
 import com.gemwallet.android.model.ChainSignData
+import uniffi.gemstone.GemResource
 import uniffi.gemstone.GemTransactionLoadMetadata
+import uniffi.gemstone.TronStakeData
 
 data class TronChainData(
     val blockNumber: ULong,
@@ -10,7 +12,7 @@ data class TronChainData(
     val witnessAddress: String,
     val parentHash: String,
     val blockTimestamp: ULong,
-    val votes: Map<String, ULong> = emptyMap()
+    val tronStakeData: TronStakeData,
 ) : ChainSignData
 
 fun GemTransactionLoadMetadata.Tron.toChainData(): TronChainData {
@@ -21,6 +23,6 @@ fun GemTransactionLoadMetadata.Tron.toChainData(): TronChainData {
         txTrieRoot = transactionTreeRoot,
         witnessAddress = witnessAddress,
         parentHash = parentHash,
-        votes = votes
+        tronStakeData = stakeData,
     )
 }

blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/tron/TronChainData.kt

@@ -11,6 +11,7 @@ import com.gemwallet.android.model.GasFee
 import com.google.protobuf.ByteString
 import com.wallet.core.primitives.AssetSubtype
 import com.wallet.core.primitives.Chain
+import uniffi.gemstone.TronStakeData
 import wallet.core.java.AnySigner
 import wallet.core.jni.CoinType
 import wallet.core.jni.proto.Tron
@@ -100,7 +101,8 @@ class TronSignClient(
         privateKey: ByteArray
     ): List<ByteArray> {
         val chainData = chainData as TronChainData
-        val voteContract = createVoteContract(chainData, params.from.address)
+        val votes = (chainData.tronStakeData as? TronStakeData.Votes)?.v1 ?: throw IllegalArgumentException()
+        val voteContract = createVoteContract(votes, params.from.address)
         return listOf(
             sign(chainData, voteContract, fee, privateKey),
         )
@@ -114,9 +116,9 @@ class TronSignClient(
         privateKey: ByteArray
     ): List<ByteArray> {
         val chainData = chainData as TronChainData
-        val votes = chainData.votes
+        val votes = (chainData.tronStakeData as? TronStakeData.Votes)?.v1 ?: throw IllegalArgumentException()
         return listOfNotNull(
-            if (votes.isEmpty()) null else createVoteContract(chainData, params.from.address),
+            if (votes.isEmpty()) null else createVoteContract(votes,params.from.address),
         )
         .map {
             sign(chainData, it, fee, privateKey)
@@ -131,7 +133,8 @@ class TronSignClient(
         privateKey: ByteArray
     ): List<ByteArray> {
         val chainData = chainData as TronChainData
-        val voteContract = createVoteContract(chainData, params.from.address)
+        val votes = (chainData.tronStakeData as? TronStakeData.Votes)?.v1 ?: throw IllegalArgumentException()
+        val voteContract = createVoteContract(votes, params.from.address)
         return listOf(sign(chainData, voteContract, fee, privateKey))
     }
 
@@ -232,14 +235,14 @@ class TronSignClient(
         return signTransfer(chainData, contract, memo, null,  privateKey)
     }
 
-    private fun createVoteContract(chainData: TronChainData, owner: String) = Tron.VoteWitnessContract.newBuilder().apply {
+    private fun createVoteContract(votes: List<uniffi.gemstone.TronVote>, owner: String) = Tron.VoteWitnessContract.newBuilder().apply {
             this.ownerAddress = owner
             this.support = true
             this.addAllVotes(
-                chainData.votes.map {
+                votes.map {
                     Tron.VoteWitnessContract.Vote.newBuilder().apply {
-                        this.voteAddress = it.key
-                        this.voteCount = it.value.toLong()
+                        this.voteAddress = it.validator
+                        this.voteCount = it.count.toLong()
                     }.build()
                 }
             )

blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/tron/TronSignClient.kt

@@ -47,7 +47,7 @@ class PerpetualService(
 
     suspend fun getCandleSticks(chain: Chain = Chain.HyperCore, symbol: String, period: ChartPeriod): List<ChartCandleStick> {
         val response = try {
-            gateway.getCandlesticks(chain.string, symbol, period.string)
+            gateway.getPerpetualCandlesticks(chain.string, symbol, period.string)
         } catch (_: Throwable) {
             return emptyList()
         }
@@ -140,7 +140,6 @@ fun GemChartCandleStick.toDTO(): ChartCandleStick {
         low = low,
         close = close,
         volume = volume,
-        interval = "" // TODO: In
     )
 }
 

blockchain/src/main/kotlin/com/gemwallet/android/blockchain/services/PerpetualService.kt

@@ -222,7 +222,11 @@ class BridgesRepository(
             sessionProposal = sessionProposal,
             supportedNamespaces = supportedNamespaces
         )
-        val approveProposal = Wallet.Params.SessionApprove(proposerPublicKey = sessionProposal.proposerPublicKey, namespaces = sessionNamespaces)
+        val approveProposal = Wallet.Params.SessionApprove(
+            proposerPublicKey = sessionProposal.proposerPublicKey,
+            namespaces = sessionNamespaces,
+            properties = proposal.properties ?: emptyMap(),
+        )
 
         WalletKit.approveSession(
             params = approveProposal,

core

@@ -36,6 +36,21 @@ enum class ChainNamespace(val string: String, val methods: List<WalletConnection
             WalletConnectionMethods.SuiSignTransaction,
             WalletConnectionMethods.SuiSignAndExecuteTransaction,
         )
+    ),
+    Ton(
+        Chain.Ton.string,
+        listOf(
+            WalletConnectionMethods.TonSendMessage,
+            WalletConnectionMethods.TonSignData,
+        )
+    ),
+    Tron(
+        Chain.Tron.string,
+        listOf(
+            WalletConnectionMethods.TronSignMessage,
+            WalletConnectionMethods.TronSignTransaction,
+            WalletConnectionMethods.TronSendTransaction,
+        )
     )
 }
 
@@ -48,7 +63,9 @@ fun Chain.getNameSpace(): ChainNamespace? {
         ChainType.Ethereum -> ChainNamespace.Eip155
         ChainType.Solana -> ChainNamespace.Solana
         ChainType.Sui -> ChainNamespace.Sui
-        else -> return null
+        ChainType.Ton -> ChainNamespace.Ton
+        ChainType.Tron -> ChainNamespace.Tron
+        else -> null
     }
 }
 
@@ -59,7 +76,7 @@ fun Chain.getReference(): String? {
 fun Chain.Companion.getNamespace(walletConnectChainId: String?): Chain? { // TODO: Use Reown call for parse
     val chainId = walletConnectChainId?.split(":")
     return if (!chainId.isNullOrEmpty() && chainId.size >= 2) {
-        return WalletConnect().getChain(chainId[0], chainId[1])?.toChain()
+        WalletConnect().getChain(chainId[0], chainId[1])?.toChain()
     } else {
         null
     }

data/repositories/src/main/kotlin/com/gemwallet/android/data/repositoreis/bridge/BridgesRepository.kt

@@ -538,7 +538,6 @@ class FakePerpetualRepository @Inject constructor() : PerpetualRepository {
                 low = basePrice + variance - 200.0,
                 close = basePrice + variance + 100.0,
                 volume = 500000000.0 + (index * 10000000.0),
-                interval = "1h",
             )
         }
 
@@ -552,7 +551,6 @@ class FakePerpetualRepository @Inject constructor() : PerpetualRepository {
                 low = basePrice + variance - 10.0,
                 close = basePrice + variance + 5.0,
                 volume = 300000000.0 + (index * 5000000.0),
-                interval = "1h",
             )
         }
 
@@ -566,7 +564,6 @@ class FakePerpetualRepository @Inject constructor() : PerpetualRepository {
                 low = basePrice + variance - 1.0,
                 close = basePrice + variance + 0.5,
                 volume = 100000000.0 + (index * 2000000.0),
-                interval = "1h",
             )
         }