Skip to content

Commit 479d3b4

Browse files
committed
remove wallet core address validation and fee estimation
1 parent 99942fb commit 479d3b4

16 files changed

Lines changed: 41 additions & 387 deletions

File tree

android/app/src/main/kotlin/com/gemwallet/android/di/InteractsModule.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import com.gemwallet.android.application.wallet_import.coordinators.SyncWalletIm
77
import com.gemwallet.android.blockchain.operators.CreateAccountOperator
88
import com.gemwallet.android.blockchain.operators.CreateWalletOperator
99
import com.gemwallet.android.blockchain.operators.DeleteKeyStoreOperator
10+
import com.gemwallet.android.blockchain.operators.GemstoneValidateAddressOperator
1011
import com.gemwallet.android.blockchain.operators.LoadPrivateDataOperator
1112
import com.gemwallet.android.blockchain.operators.LoadPrivateKeyOperator
1213
import com.gemwallet.android.blockchain.operators.StorePhraseOperator
@@ -18,7 +19,6 @@ import com.gemwallet.android.blockchain.operators.walletcore.WCDeleteKeyStoreOpe
1819
import com.gemwallet.android.blockchain.operators.walletcore.WCLoadPrivateDataOperator
1920
import com.gemwallet.android.blockchain.operators.walletcore.WCLoadPrivateKeyOperator
2021
import com.gemwallet.android.blockchain.operators.walletcore.WCStorePhraseOperator
21-
import com.gemwallet.android.blockchain.operators.walletcore.WCValidateAddressOperator
2222
import com.gemwallet.android.blockchain.operators.walletcore.WCValidatePhraseOperator
2323
import com.gemwallet.android.cases.device.SyncSubscription
2424
import com.gemwallet.android.cases.wallet.ImportWalletService
@@ -41,7 +41,7 @@ object InteractsModule {
4141

4242
@Singleton
4343
@Provides
44-
fun provideValidateAddressInteract(): ValidateAddressOperator = WCValidateAddressOperator()
44+
fun provideValidateAddressInteract(): ValidateAddressOperator = GemstoneValidateAddressOperator()
4545

4646
@Singleton
4747
@Provides

android/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/BitcoinGatewayEstimateFee.kt

Lines changed: 0 additions & 111 deletions
This file was deleted.

android/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/clients/bitcoin/BitcoinUtxoMapper.kt

Lines changed: 0 additions & 25 deletions
This file was deleted.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package com.gemwallet.android.blockchain.operators
2+
3+
import com.gemwallet.android.ext.isValidAddress
4+
import com.wallet.core.primitives.Chain
5+
6+
class GemstoneValidateAddressOperator : ValidateAddressOperator {
7+
override operator fun invoke(address: String, chain: Chain): Result<Boolean> =
8+
Result.success(chain.isValidAddress(address))
9+
}

android/blockchain/src/main/kotlin/com/gemwallet/android/blockchain/operators/walletcore/WCValidateAddressOperator.kt

Lines changed: 0 additions & 10 deletions
This file was deleted.

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

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
package com.gemwallet.android.blockchain.services
22

3-
import com.gemwallet.android.blockchain.clients.bitcoin.BitcoinGatewayEstimateFee
43
import com.gemwallet.android.blockchain.gemstone.selectFeeRate
54
import com.gemwallet.android.blockchain.gemstone.toChainData
65
import com.gemwallet.android.blockchain.gemstone.toFee
7-
import com.gemwallet.android.ext.toChainType
86
import com.gemwallet.android.ext.toFeePriority
97
import com.gemwallet.android.model.ConfirmParams
108
import com.gemwallet.android.model.SignerParams
119
import com.wallet.core.primitives.AssetId
1210
import com.wallet.core.primitives.Chain
13-
import com.wallet.core.primitives.ChainType
1411
import com.wallet.core.primitives.FeePriority
1512
import kotlinx.coroutines.Dispatchers
1613
import kotlinx.coroutines.async
@@ -69,7 +66,7 @@ class SignerPreloaderProxy(
6966
isMaxValue = params.useMaxAmount,
7067
metadata = metadata,
7168
),
72-
provider = getEstimateFee(chain)
69+
provider = EmptyEstimateFeeProvider
7370
)
7471
val fee = chain.toFee(feeAssetId, selectedPriority, result.fee)
7572
val chainData = result.metadata.toChainData()
@@ -81,27 +78,7 @@ class SignerPreloaderProxy(
8178
)
8279
}
8380

84-
private fun getEstimateFee(chain: Chain): GemGatewayEstimateFee {
85-
return when (chain.toChainType()) {
86-
ChainType.Bitcoin -> BitcoinGatewayEstimateFee()
87-
ChainType.Ethereum,
88-
ChainType.Cardano,
89-
ChainType.Solana,
90-
ChainType.Cosmos,
91-
ChainType.Ton,
92-
ChainType.Tron,
93-
ChainType.Aptos,
94-
ChainType.Sui,
95-
ChainType.Xrp,
96-
ChainType.Near,
97-
ChainType.Stellar,
98-
ChainType.Algorand,
99-
ChainType.Polkadot,
100-
ChainType.HyperCore -> StubGatewayEstimateFee
101-
}
102-
}
103-
104-
private object StubGatewayEstimateFee : GemGatewayEstimateFee {
81+
private object EmptyEstimateFeeProvider : GemGatewayEstimateFee {
10582
override suspend fun getFee(
10683
chain: uniffi.gemstone.Chain,
10784
input: GemTransactionLoadInput

ios/Packages/Blockchain/Sources/EstimateFeeService/BitcoinService.swift

Lines changed: 0 additions & 88 deletions
This file was deleted.

ios/Packages/Blockchain/Sources/EstimateFeeService/EstimateFeeService.swift

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,8 @@ import Primitives
77
struct EstimateFeeService {
88
init() {}
99

10-
func provider(chain: Primitives.Chain) throws -> any GemGatewayEstimateFee {
11-
switch chain.type {
12-
case .bitcoin: try BitcoinService(chain: BitcoinChain(id: chain.rawValue))
13-
default: EmptyService()
14-
}
10+
func provider(chain _: Primitives.Chain) -> any GemGatewayEstimateFee {
11+
EmptyService()
1512
}
1613

1714
func getFee(chain: Gemstone.Chain, input: Gemstone.GemTransactionLoadInput) async throws -> Gemstone.GemTransactionLoadFee? {

0 commit comments

Comments
 (0)