Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix syncing issues in Tron and Bitcoin #6949

Merged
merged 1 commit into from
Jan 10, 2024
Merged

Fix syncing issues in Tron and Bitcoin #6949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ android {
compileSdk compile_sdk_version
minSdkVersion min_sdk_version
targetSdkVersion compile_sdk_version
versionCode 94
versionName "0.37.0"
versionCode 95
versionName "0.37.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

kapt {
Expand Down Expand Up @@ -91,7 +91,7 @@ android {
resValue "string", "openSeaApiKey", "bfbd6061a33e455c8581b594774fecb3"
resValue "string", "walletConnectV2Key", "8b4f41c60880a3e3ad57d82fddb30568"
resValue "string", "solscanApiKey", "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjcmVhdGVkQXQiOjE2Nzk0NjQyMTQ4NDAsImVtYWlsIjoiaHJ6c3lzdGVtczEwMUBnbWFpbC5jb20iLCJhY3Rpb24iOiJ0b2tlbi1hcGkiLCJpYXQiOjE2Nzk0NjQyMTR9.BRM7J9RbDpHgd2oMAus00XfWOxTJgV2Tn2_chXZOdtk"
resValue "string", "trongridApiKey", "33374494-8060-447e-8367-90c5efd4ed95"
resValue "string", "trongridApiKeys", "33374494-8060-447e-8367-90c5efd4ed95"
resValue "string", "udnApiKey", "r2phzgatt_zt9-hd_wyvdjrdsrimnxgokm7knyag1malzgcz"
resValue "string", "oneInchApiKey", "ElyK7s22HR0JD78CEXVPnpZA8UyuUwIl"
resValue "string", "blockchairApiKey", "M___unstoppn7jfFpe40X___________"
Expand Down Expand Up @@ -133,7 +133,7 @@ android {
resValue "string", "openSeaApiKey", "bfbd6061a33e455c8581b594774fecb3"
resValue "string", "walletConnectV2Key", "0c5ca155c2f165a7d0c88686f2113a72"
resValue "string", "solscanApiKey", "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjcmVhdGVkQXQiOjE2Nzk0NjQxMTQ0ODUsImVtYWlsIjoiaHNkYW84ODg4QGdtYWlsLmNvbSIsImFjdGlvbiI6InRva2VuLWFwaSIsImlhdCI6MTY3OTQ2NDExNH0.91DUjjjYu86f1ZMMJ5cyJxIKTTw_srhI-vNgYaTCPUU"
resValue "string", "trongridApiKey", "8f5ae2c8-8012-42a8-b0ca-ffc2741f6a29"
resValue "string", "trongridApiKeys", "8f5ae2c8-8012-42a8-b0ca-ffc2741f6a29,578aa64f-a79f-4ee8-86e9-e9860e2d050a,1e92f1fc-41f8-401f-a7f6-5b719b6f1280"
resValue "string", "udnApiKey", "r2phzgatt_zt9-hd_wyvdjrdsrimnxgokm7knyag1malzgcz"
resValue "string", "oneInchApiKey", "ElyK7s22HR0JD78CEXVPnpZA8UyuUwIl"
resValue "string", "blockchairApiKey", "M___unstoppn7jfFpe40X___________"
Expand Down Expand Up @@ -273,13 +273,13 @@ dependencies {

// Wallet kits
implementation 'com.github.horizontalsystems:ton-kit-kmm:18bc110'
implementation 'com.github.horizontalsystems:bitcoin-kit-android:59b8e4e'
implementation 'com.github.horizontalsystems:bitcoin-kit-android:6ff6456'
implementation 'com.github.horizontalsystems:ethereum-kit-android:3a02f3a'
implementation 'com.github.horizontalsystems:blockchain-fee-rate-kit-android:1d3bd49'
implementation 'com.github.horizontalsystems:binance-chain-kit-android:c1509a2'
implementation 'com.github.horizontalsystems:market-kit-android:746d398'
implementation 'com.github.horizontalsystems:solana-kit-android:34ef394'
implementation 'com.github.horizontalsystems:tron-kit-android:5eb6395'
implementation 'com.github.horizontalsystems:tron-kit-android:f2f7c9a'
// Zcash SDK
implementation "cash.z.ecc.android:zcash-android-sdk:2.0.1"
implementation("io.github.binance:binance-connector-java:3.0.0rc2") {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/io/horizontalsystems/bankwallet/core/managers/TronKitManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class TronKitManager(
walletId = account.id,
seed = seed,
network = network,
tronGridApiKey = appConfigProvider.trongridApiKey
tronGridApiKeys = appConfigProvider.trongridApiKeys
)

return TronKitWrapper(kit, signer)
Expand All @@ -99,7 +99,7 @@ class TronKitManager(
address = Address.fromBase58(address),
network = network,
walletId = account.id,
tronGridApiKey = appConfigProvider.trongridApiKey
tronGridApiKeys = appConfigProvider.trongridApiKeys
)

return TronKitWrapper(kit, null)
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/io/horizontalsystems/bankwallet/core/providers/AppConfigProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ class AppConfigProvider(localStorage: ILocalStorage) {
Translator.getString(R.string.solscanApiKey)
}

val trongridApiKey by lazy {
Translator.getString(R.string.trongridApiKey)
val trongridApiKeys: List<String> by lazy {
Translator.getString(R.string.trongridApiKeys).split(",")
}

val udnApiKey by lazy {
Expand Down
2 changes: 1 addition & 1 deletion ...in/java/io/horizontalsystems/bankwallet/modules/addtoken/AddTronTokenBlockchainService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class AddTronTokenBlockchainService(

companion object {
fun getInstance(blockchain: Blockchain): AddTronTokenBlockchainService {
val trc20Provider = Trc20Provider.getInstance(Network.Mainnet, App.appConfigProvider.trongridApiKey)
val trc20Provider = Trc20Provider.getInstance(Network.Mainnet, App.appConfigProvider.trongridApiKeys)
return AddTronTokenBlockchainService(blockchain, trc20Provider)
}
}
Expand Down