From 6446a5592e379fb61aee0cadc088839c31a7f524 Mon Sep 17 00:00:00 2001 From: James Brown Date: Wed, 2 Dec 2020 11:23:53 +1100 Subject: [PATCH 1/3] Update Binance transaction API endpoints --- .../alphawallet/app/repository/EthereumNetworkBase.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/alphawallet/app/repository/EthereumNetworkBase.java b/app/src/main/java/com/alphawallet/app/repository/EthereumNetworkBase.java index da0ca245b..aa37ac7e4 100644 --- a/app/src/main/java/com/alphawallet/app/repository/EthereumNetworkBase.java +++ b/app/src/main/java/com/alphawallet/app/repository/EthereumNetworkBase.java @@ -143,13 +143,13 @@ public abstract class EthereumNetworkBase implements EthereumNetworkRepositoryTy ARTIS_TAU1_RPC_URL, "https://explorer.tau1.artis.network/"), new NetworkInfo(C.BINANCE_TEST_NETWORK, C.BINANCE_SYMBOL, BINANCE_TEST_RPC_URL, - "https://explorer.binance.org/smart-testnet/tx/", BINANCE_TEST_ID, false, + "https://testnet.bscscan.com/tx/", BINANCE_TEST_ID, false, BINANCE_TEST_FALLBACK_RPC_URL, - "https://explorer.binance.org/smart-testnet/"), + "https://api-testnet.bscscan.com/"), new NetworkInfo(C.BINANCE_MAIN_NETWORK, C.BINANCE_SYMBOL, BINANCE_MAIN_RPC_URL, - "https://explorer.binance.org/smart/tx/", BINANCE_MAIN_ID, false, + "https://bscscan.com/tx/", BINANCE_MAIN_ID, false, BINANCE_MAIN_FALLBACK_RPC_URL, - "https://explorer.binance.org/smart"), + "https://api.bscscan.com/"), }; final PreferenceRepositoryType preferences; From cc985b37fc65061e4a9c130184054b0f3753b1e0 Mon Sep 17 00:00:00 2001 From: James Brown Date: Wed, 2 Dec 2020 11:32:37 +1100 Subject: [PATCH 2/3] Add full migration path in case of user testing old versions, or version upgrade from a long time ago --- .../app/service/AWRealmMigration.java | 45 ++++++++++++++++++- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/alphawallet/app/service/AWRealmMigration.java b/app/src/main/java/com/alphawallet/app/service/AWRealmMigration.java index b36f62a4e..022a0dea7 100644 --- a/app/src/main/java/com/alphawallet/app/service/AWRealmMigration.java +++ b/app/src/main/java/com/alphawallet/app/service/AWRealmMigration.java @@ -52,8 +52,49 @@ public void migrate(DynamicRealm realm, long oldVersion, long newVersion) if (oldVersion == 7) { RealmObjectSchema realmData = schema.get("RealmAuxData"); - if (!realmData.hasField("tokenAddress")) realmData.addField("tokenAddress", String.class); - if (!realmData.hasField("resultReceivedTime")) realmData.addField("resultReceivedTime", long.class); + if (realmData == null) + { + schema.create("RealmAuxData") + .addField("instanceKey", String.class, FieldAttribute.PRIMARY_KEY) + .addField("chainId", int.class) + .addField("tokenAddress", String.class) + .addField("tokenId", String.class) + .addField("functionId", String.class) + .addField("result", String.class) + .addField("resultTime", long.class) + .addField("resultReceivedTime", long.class); + } + else + { + if (!realmData.hasField("tokenAddress")) + realmData.addField("tokenAddress", String.class); + if (!realmData.hasField("resultReceivedTime")) + realmData.addField("resultReceivedTime", long.class); + } + + realmData = schema.get("RealmKeyType"); + if (realmData == null) + { + schema.create("RealmKeyType") + .addField("address", String.class, FieldAttribute.PRIMARY_KEY) + .addField("type", byte.class) + .addField("authLevel", String.class) + .addField("lastBackup", long.class) + .addField("dateAdded", long.class) + .addField("modulus", String.class); + } + + realmData = schema.get("RealmWalletData"); + if (realmData == null) + { + schema.create("RealmWalletData") + .addField("address", String.class, FieldAttribute.PRIMARY_KEY) + .addField("ENSName", String.class) + .addField("balance", String.class) + .addField("name", String.class) + .addField("lastWarning", long.class); + } + oldVersion += 2; } else if (oldVersion == 8) From 5735b9fdbfe033752f3ed2e5668e4ad0a2d70dbd Mon Sep 17 00:00:00 2001 From: James Brown Date: Wed, 2 Dec 2020 12:33:11 +1100 Subject: [PATCH 3/3] bump gradle --- app/build.gradle | 10 +++++----- build.gradle | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index bfa9f7d1f..57b1f24b7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,8 +35,8 @@ android { } } defaultConfig { - versionCode 133 - versionName "3.20.5" + versionCode 136 + versionName "3.21.2" applicationId "io.stormbird.wallet" minSdkVersion 23 @@ -107,7 +107,7 @@ android { apply plugin: 'com.google.gms.google-services' apply plugin: 'com.google.firebase.crashlytics' dependencies { - implementation 'com.google.firebase:firebase-analytics:17.6.0' + implementation 'com.google.firebase:firebase-analytics:18.0.0' implementation 'com.mixpanel.android:mixpanel-android:5.8.4' } } @@ -149,7 +149,7 @@ dependencies { implementation 'com.google.zxing:core:3.3.2' // Sugar - implementation 'androidx.constraintlayout:constraintlayout:2.0.2' + implementation 'androidx.constraintlayout:constraintlayout:2.0.4' implementation 'com.github.apl-devs:appintro:v4.2.2' implementation 'com.romandanylyk:pageindicatorview:1.0.0' @@ -193,7 +193,7 @@ dependencies { exclude group: 'com.android.support', module: 'support-annotations' }) - implementation 'com.google.firebase:firebase-crashlytics:17.2.2' + implementation 'com.google.firebase:firebase-crashlytics:17.3.0' implementation "com.trustwallet:wallet-core:0.12.31" diff --git a/build.gradle b/build.gradle index 45e138eda..27e90734c 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ buildscript { // don't do that. add that dependency to app/build.gradle classpath 'com.google.gms:google-services:4.3.4' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1' } }