diff --git a/.github/workflows/codestyle.yml b/.github/workflows/codestyle.yml new file mode 100644 index 0000000000..3c02b29da4 --- /dev/null +++ b/.github/workflows/codestyle.yml @@ -0,0 +1,27 @@ +name: Check code format +on: + pull_request: +jobs: + lint: + name: Check + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Setup NodeJS + uses: actions/setup-node@v3 + with: + node-version: 16 + - name: Install dependencies + run: npm install + - name: Get changed files + id: changed-files + uses: tj-actions/changed-files@v34 + - name: Check all changed files + run: | + for file in ${{ steps.changed-files.outputs.all_changed_files }}; do + npx ec "$file" + done + diff --git a/app/build.gradle b/app/build.gradle index 38be46d0f6..9af5d6f2d3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -85,8 +85,8 @@ android { } } defaultConfig { - versionCode 202 - versionName "3.58.3" + versionCode 224 + versionName "3.60.8" applicationId "io.stormbird.wallet" minSdkVersion 23 @@ -132,7 +132,7 @@ android { Below code is used to include analytics only when Flavor is "No Analytics" This is due to China release where Google services should not be included */ - apply plugin: 'com.google.gms.google-services' + //apply plugin: 'com.google.gms.google-services' apply plugin: 'com.google.firebase.crashlytics' } noAnalytics { @@ -164,7 +164,7 @@ android { signingConfig signingConfigs.release } proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } + } } packagingOptions { exclude 'META-INF/NOTICE' // will not include NOTICE file @@ -184,6 +184,8 @@ android { abortOnError false } compileOptions { + // Flag to enable support for the new language APIs + coreLibraryDesugaringEnabled true targetCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8 } @@ -273,8 +275,9 @@ dependencies { implementation 'com.github.apl-devs:appintro:v4.2.2' implementation 'com.github.romandanylyk:PageIndicatorView:v1.0.0' - //coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.5' + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' + implementation 'io.reactivex:rxjava:1.2.4' // ReactiveX implementation 'io.reactivex.rxjava2:rxjava:2.2.21' implementation "io.reactivex.rxjava2:rxandroid:2.1.1" @@ -348,11 +351,12 @@ dependencies { implementation 'androidx.work:work-runtime:2.7.1' - //Analytics - analyticsImplementation 'com.google.android.play:core:1.10.3' - analyticsImplementation 'com.google.firebase:firebase-analytics:21.1.1' + analyticsImplementation platform('com.google.firebase:firebase-bom:28.1.0') + //analyticsImplementation 'com.google.firebase:firebase-analytics' + analyticsImplementation 'com.google.firebase:firebase-crashlytics' + //analyticsImplementation 'com.google.firebase:firebase-analytics:21.1.1' analyticsImplementation 'com.mixpanel.android:mixpanel-android:5.8.4' - analyticsImplementation 'com.google.firebase:firebase-crashlytics:18.2.13' + //analyticsImplementation 'com.google.firebase:firebase-crashlytics:18.2.13' } // WARNING WARNING WARNING diff --git a/app/libs/core-4.8.8-android.jar b/app/libs/core-4.8.8-android.jar index 4d7cf4511e..236a3924c6 100644 Binary files a/app/libs/core-4.8.8-android.jar and b/app/libs/core-4.8.8-android.jar differ diff --git a/app/proguard-android-optimize.txt b/app/proguard-android-optimize.txt index a598dab8a2..dea3b6b062 100644 --- a/app/proguard-android-optimize.txt +++ b/app/proguard-android-optimize.txt @@ -110,3 +110,23 @@ # These classes are duplicated between android.jar and core-lambda-stubs.jar. -dontnote java.lang.invoke.** + +-keepclasseswithmembernames,includedescriptorclasses class * { + native ; +} + +#trust wallet +-keep class wallet.core.jni.** { *; } +-keep class wallet.core.jni.proto.** { *; } +-keep class org.web3j.** { *; } + +#entities, jsInterface & listeners +-keep class com.alphawallet.token.** { *; } +-keep class com.alphawallet.app.walletconnect.** { *; } +-keep class com.alphawallet.app.web3.** { *; } +-keep class com.alphawallet.app.web3j.** { *; } +-keep class com.alphawallet.app.entity.** { *; } + +-repackageclasses +#-dontobfuscate +#-printconfiguration ../full-r8-config.txt \ No newline at end of file diff --git a/app/src/analytics/java/com/alphawallet/app/service/AnalyticsService.java b/app/src/analytics/java/com/alphawallet/app/service/AnalyticsService.java index ddc0907219..98a6817d13 100644 --- a/app/src/analytics/java/com/alphawallet/app/service/AnalyticsService.java +++ b/app/src/analytics/java/com/alphawallet/app/service/AnalyticsService.java @@ -8,27 +8,22 @@ import com.alphawallet.app.C; import com.alphawallet.app.entity.AnalyticsProperties; import com.alphawallet.app.entity.ServiceErrorException; -import com.alphawallet.app.repository.KeyProvider; import com.alphawallet.app.repository.KeyProviderFactory; -import com.google.firebase.analytics.FirebaseAnalytics; import com.google.firebase.crashlytics.FirebaseCrashlytics; -import com.google.firebase.iid.FirebaseInstanceId; import com.mixpanel.android.mpmetrics.MixpanelAPI; import org.json.JSONException; import org.json.JSONObject; -import java.util.Objects; - public class AnalyticsService implements AnalyticsServiceType { private final MixpanelAPI mixpanelAPI; - private final FirebaseAnalytics firebaseAnalytics; + //private final FirebaseAnalytics firebaseAnalytics; public AnalyticsService(Context context) { mixpanelAPI = MixpanelAPI.getInstance(context, KeyProviderFactory.get().getAnalyticsKey()); - firebaseAnalytics = FirebaseAnalytics.getInstance(context); + //firebaseAnalytics = FirebaseAnalytics.getInstance(context); } @Override @@ -62,7 +57,7 @@ private void trackFirebase(AnalyticsProperties analyticsProperties, String event props.putString(C.APP_NAME, BuildConfig.APPLICATION_ID); - firebaseAnalytics.logEvent(eventName, props); + //firebaseAnalytics.logEvent(eventName, props); } private void trackMixpanel(AnalyticsProperties analyticsProperties, String eventName) @@ -92,17 +87,17 @@ private void trackMixpanel(AnalyticsProperties analyticsProperties, String event @Override public void identify(String uuid) { - firebaseAnalytics.setUserId(uuid); + //firebaseAnalytics.setUserId(uuid); mixpanelAPI.identify(uuid); mixpanelAPI.getPeople().identify(uuid); - FirebaseInstanceId.getInstance().getInstanceId() + /*FirebaseInstanceId.getInstance().getInstanceId() .addOnCompleteListener(task -> { if (task.isSuccessful()) { String token = Objects.requireNonNull(task.getResult()).getToken(); mixpanelAPI.getPeople().setPushRegistrationId(token); } - }); + });*/ } @Override diff --git a/app/src/analytics/java/com/alphawallet/app/util/RateApp.java b/app/src/analytics/java/com/alphawallet/app/util/RateApp.java index 0bc6ff9ecd..8118154b2b 100644 --- a/app/src/analytics/java/com/alphawallet/app/util/RateApp.java +++ b/app/src/analytics/java/com/alphawallet/app/util/RateApp.java @@ -1,6 +1,8 @@ package com.alphawallet.app.util; import android.app.Activity; +import android.content.Intent; +import android.net.Uri; import android.view.LayoutInflater; import android.view.View; import android.widget.RatingBar; @@ -10,10 +12,6 @@ import com.alphawallet.app.R; import com.alphawallet.app.repository.PreferenceRepositoryType; import com.google.android.material.dialog.MaterialAlertDialogBuilder; -import com.google.android.play.core.review.ReviewInfo; -import com.google.android.play.core.review.ReviewManager; -import com.google.android.play.core.review.ReviewManagerFactory; -import com.google.android.play.core.tasks.Task; public class RateApp { // should be shown on 5th run or after the first transaction (afterTransaction == true) @@ -38,9 +36,7 @@ static public void showRateTheApp(Activity context, PreferenceRepositoryType pre preferenceRepository.setRateAppShown(); } }) - .setNegativeButton(R.string.rate_no_thanks, (dialogInterface, i) -> { - preferenceRepository.setRateAppShown(); - }); + .setNegativeButton(R.string.rate_no_thanks, (dialogInterface, i) -> preferenceRepository.setRateAppShown()); AlertDialog dialog = builder.show(); ratingBar.setOnRatingBarChangeListener((rb, rating, fromUser) -> { @@ -53,18 +49,12 @@ static public void showRateTheApp(Activity context, PreferenceRepositoryType pre } } - private static void startRateFlow(Activity context, PreferenceRepositoryType preferenceRepository) { - ReviewManager manager = ReviewManagerFactory.create(context); - Task request = manager.requestReviewFlow(); - request.addOnCompleteListener(task -> { - if (task.isSuccessful()) { - ReviewInfo reviewInfo = task.getResult(); - Task flow = manager.launchReviewFlow(context, reviewInfo); - flow.addOnCompleteListener(flowTask -> { - - }); - } - }); + private static void startRateFlow(Activity activity, PreferenceRepositoryType preferenceRepository) { + //simply take them to play store for now, until the current situation with play store libraries not being allowed is resolved + Intent intent = new Intent(Intent.ACTION_VIEW); + intent.setData(Uri.parse("https://play.google.com/store/apps/details?id=" + activity.getPackageName())); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NO_ANIMATION); + activity.startActivity(intent); // save rate ui shown preferenceRepository.setRateAppShown(); } diff --git a/app/src/analytics/java/com/alphawallet/app/util/UpdateUtils.java b/app/src/analytics/java/com/alphawallet/app/util/UpdateUtils.java index d928006dbe..57b5310761 100644 --- a/app/src/analytics/java/com/alphawallet/app/util/UpdateUtils.java +++ b/app/src/analytics/java/com/alphawallet/app/util/UpdateUtils.java @@ -1,19 +1,15 @@ package com.alphawallet.app.util; import android.app.Activity; +import android.content.Intent; +import android.net.Uri; import com.alphawallet.app.entity.FragmentMessenger; -import com.google.android.play.core.appupdate.AppUpdateInfo; -import com.google.android.play.core.appupdate.AppUpdateManager; -import com.google.android.play.core.appupdate.AppUpdateManagerFactory; -import com.google.android.play.core.appupdate.AppUpdateOptions; -import com.google.android.play.core.install.model.AppUpdateType; -import com.google.android.play.core.install.model.UpdateAvailability; -import com.google.android.play.core.tasks.Task; public class UpdateUtils { + //Pull update check for now public static void checkForUpdates(Activity context, FragmentMessenger messenger) { - AppUpdateManager appUpdateManager = AppUpdateManagerFactory.create(context); + /*AppUpdateManager appUpdateManager = AppUpdateManagerFactory.create(context); Task appUpdateInfoTask = appUpdateManager.getAppUpdateInfo(); @@ -22,12 +18,18 @@ public static void checkForUpdates(Activity context, FragmentMessenger messenger { messenger.updateReady(appUpdateInfo.availableVersionCode()); } - }); + });*/ } - public static void pushUpdateDialog(Activity context) + public static void pushUpdateDialog(Activity activity) { - AppUpdateManager appUpdateManager = AppUpdateManagerFactory.create(context); + Intent intent = new Intent(Intent.ACTION_VIEW); + intent.setData(Uri.parse("https://play.google.com/store/apps/details?id=" + activity.getPackageName())); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NO_ANIMATION); + + activity.startActivity(intent); + + /*AppUpdateManager appUpdateManager = AppUpdateManagerFactory.create(context); Task appUpdateInfoTask = appUpdateManager.getAppUpdateInfo(); @@ -36,6 +38,6 @@ public static void pushUpdateDialog(Activity context) { appUpdateManager.startUpdateFlow(appUpdateInfo, context, AppUpdateOptions.newBuilder(AppUpdateType.FLEXIBLE).build()); } - }); + });*/ } } diff --git a/app/src/androidTest/java/com/alphawallet/app/TokenScriptCertificateTest.java b/app/src/androidTest/java/com/alphawallet/app/TokenScriptCertificateTest.java index 6364c0efa1..d5ae6e7985 100644 --- a/app/src/androidTest/java/com/alphawallet/app/TokenScriptCertificateTest.java +++ b/app/src/androidTest/java/com/alphawallet/app/TokenScriptCertificateTest.java @@ -42,10 +42,12 @@ */ public class TokenScriptCertificateTest extends BaseE2ETest { - private final String doorContractAddress; + private String doorContractAddress; private final String contractOwnerPk = "0x69c22d654be7fe75e31fbe26cb56c93ec91144fab67cb71529c8081971635069"; private final Web3j web3j; + private final boolean useMumbai = false; //for local testing + private static final Map WALLETS_ON_GANACHE = new HashMap() {{ put("24", new String[]{"0x644022aef70ad515ee186345fd74b005d759f41be8157c2835de3597d943146d", "0xE494323823fdF1A1Ab6ca79d2538C7182690D52a"}); @@ -81,6 +83,12 @@ public TokenScriptCertificateTest() //Always use zero nonce for determining the contract address doorContractAddress = EthUtils.calculateContractAddress(deployCredentials.getAddress(), 0L); + + if (useMumbai) + { + //If using Mumbai for this test: + doorContractAddress = "0xA0343dfd68FcD7F18153b8AB87936c5A9C1Da20e"; + } } @Test @@ -100,8 +108,8 @@ public void should_view_signature_details() assertThat(getWalletAddress(), equalTo(ownerAddress)); - addNewNetwork("Ganache"); - selectTestNet("Ganache"); + addNewNetwork("Ganache", GANACHE_URL); + selectTestNet(useMumbai ? "Mumbai" : "Ganache"); //Ensure we're on the wallet page switchToWallet(ownerAddress); @@ -117,7 +125,7 @@ public void should_view_signature_details() onView(allOf(withId(R.id.edit_text))).perform(replaceText(doorContractAddress)); - onView(isRoot()).perform(waitUntil(withId(R.id.select_token), 30)); + onView(isRoot()).perform(waitUntil(withId(R.id.select_token), 300)); click(withId(R.id.select_token)); @@ -142,6 +150,8 @@ public void should_view_signature_details() shouldSee("Smart Token Labs"); shouldSee("ECDSA"); - shouldSee("Contract Owner"); // Note this may fail once we pull owner() from contract, test will need to be changed to contract owner, which for this test is: 0xA20efc4B9537d27acfD052003e311f762620642D + shouldSee("Contract Owner"); // Note this may fail once we pull owner() from contract, + // test will need to be changed to contract owner, + // which for this test is: 0xA20efc4B9537d27acfD052003e311f762620642D } } diff --git a/app/src/androidTest/java/com/alphawallet/app/TransferTest.java b/app/src/androidTest/java/com/alphawallet/app/TransferTest.java index 4a0b05a2d7..d6bc9ed37e 100644 --- a/app/src/androidTest/java/com/alphawallet/app/TransferTest.java +++ b/app/src/androidTest/java/com/alphawallet/app/TransferTest.java @@ -9,6 +9,7 @@ import static com.alphawallet.app.steps.Steps.selectTestNet; import static com.alphawallet.app.steps.Steps.sendBalanceTo; import static com.alphawallet.app.steps.Steps.switchToWallet; +import static com.alphawallet.app.util.EthUtils.GANACHE_URL; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.fail; @@ -46,7 +47,7 @@ public void should_transfer_from_an_account_to_another() { importWalletFromSettingsPage(privateKey); assertThat(getWalletAddress(), equalTo(existedWalletAddress)); - addNewNetwork("Ganache"); + addNewNetwork("Ganache", GANACHE_URL); selectTestNet("Ganache"); sendBalanceTo(newWalletAddress, "0.001"); ensureTransactionConfirmed(); diff --git a/app/src/androidTest/java/com/alphawallet/app/steps/Steps.java b/app/src/androidTest/java/com/alphawallet/app/steps/Steps.java index b600353316..841adfe8ea 100644 --- a/app/src/androidTest/java/com/alphawallet/app/steps/Steps.java +++ b/app/src/androidTest/java/com/alphawallet/app/steps/Steps.java @@ -15,7 +15,6 @@ import static androidx.test.espresso.matcher.ViewMatchers.withText; import static com.alphawallet.app.assertions.Should.shouldNotSee; import static com.alphawallet.app.assertions.Should.shouldSee; -import static com.alphawallet.app.util.EthUtils.GANACHE_URL; import static com.alphawallet.app.util.Helper.click; import static com.alphawallet.app.util.Helper.waitUntil; import static com.alphawallet.app.util.RootUtil.isDeviceRooted; @@ -204,16 +203,17 @@ public static void toggleSwitch(int id) { onView(allOf(withId(R.id.switch_material), isDescendantOfA(withId(id)))).perform(ViewActions.click()); } - public static void addNewNetwork(String name) + public static void addNewNetwork(String name, String url) { + gotoSettingsPage(); selectMenu("Select Active Networks"); click(withId(R.id.action_add)); input(R.id.input_network_name, name); - input(R.id.input_network_rpc_url, GANACHE_URL); + input(R.id.input_network_rpc_url, url); input(R.id.input_network_chain_id, "2"); input(R.id.input_network_symbol, "ETH"); - input(R.id.input_network_explorer_api, GANACHE_URL); - input(R.id.input_network_block_explorer_url, GANACHE_URL); + input(R.id.input_network_explorer_api, url); + input(R.id.input_network_block_explorer_url, url); onView(withId(R.id.network_input_scroll)).perform(swipeUp()); Helper.wait(1); click(withId(R.id.checkbox_testnet)); diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d3bdc3f18a..c5c23c3d8f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,6 +13,7 @@ + - - - - - - + + + + + + @@ -299,7 +300,7 @@ android:label="Search Tokens" /> + + + + @@ -314,7 +323,7 @@ - + diff --git a/app/src/main/assets/dapps_list.json b/app/src/main/assets/dapps_list.json index c640482a17..a6c26d35d2 100644 --- a/app/src/main/assets/dapps_list.json +++ b/app/src/main/assets/dapps_list.json @@ -1,9 +1,6 @@ [ {"name": "Tbull", "description": "A Utility Token on Binance Smart Chain for Payments for Services", "url": "tbull.live", "category": "Utility"}, {"name": "Rare Coin", "description": "Free Crypto Faucet & Yeild Farming", "url": "make.rare.claims", "category": "Tool"}, - {"name": "Phiswap", "description": "Swap On The Largest & Fastest Growing Decentralized Exchange", "url": "https://app.phiswap.com", "category": "Finance"}, - {"name": "Phitoken", "description": "Easily Mint New PHI20 Tokens From Any Device", "url": "https://app.phitoken.com", "category": "Tool"}, - {"name": "PHI.Auction", "description": "Mint, Buy, Sell NFT Marketplace On PHI Network Smart Chain", "url": "https://phi.auction", "category": "Marketplace"}, {"name": "Eporio", "description": "The cheaper marketplace for NFT - Non Fungible Tokens", "url": "https://epor.io", "category": "Marketplace"}, {"name": "DeFiBox", "description": "one-stop DeFi asset, data and protocols aggregation platform", "url": "https://www.defibox.com/index?utm_source=2189969", "category": "Tool"}, {"name": "TokenSets", "description": "Enhance your portfolio with automated asset management strategies.", "url": "https://www.tokensets.com/", "category": "Finance"}, @@ -30,8 +27,6 @@ {"name": "Gravity", "description": "Create your gravatar.", "url": "https://gravity.cool/", "category": "Property"}, {"name": "Mokens", "description": "Create your own collectibles", "url": "https://mokens.io/", "category": "Property"}, {"name": "TENZ-ID", "description": "TENZ-ID is a Decentralized Blockchain naming system", "url": "https://tenzorum.org/tenz_id/", "category": "Property"}, - {"name": "PHI Network", "description": "Decentralized Social Media, Earn, Entertain, Engage & Exchange", "url": "https://phi.network", "category": "Social Media"}, - {"name": "Phiswap", "description": "Swap, earn, and build on PHI Networks leading decentralized crypto trading protocol.", "url": "https://app.phiswap.com", "category": "Exchange"}, {"name": "MonitorChain", "description": "Real-time surveillance", "url": "https://secure.monitorchain.com/", "category": "Security"}, {"name": "Cent", "description": "Earn cryptocurrency sharing your wisdom and creativity.", "url": "https://beta.cent.co/", "category": "Social Media"}, {"name": "Indorse", "description": "Professional Network", "url": "https://indorse.io/", "category": "Social Media"}, diff --git a/app/src/main/assets/swap_providers_list.json b/app/src/main/assets/swap_providers_list.json new file mode 100644 index 0000000000..5f43de575b --- /dev/null +++ b/app/src/main/assets/swap_providers_list.json @@ -0,0 +1,110 @@ +[ + { + "key": "dodo", + "name": "DODO", + "url": "https://dodoex.io/", + "logoURI": "https://raw.githubusercontent.com/lifinance/types/main/src/assets/icons/exchanges/dodo.png" + }, + { + "key": "paraswap", + "name": "ParaSwap", + "url": "https://www.paraswap.io/", + "logoURI": "https://raw.githubusercontent.com/lifinance/types/main/src/assets/icons/exchanges/paraswap.png" + }, + { + "key": "1inch", + "name": "1inch", + "url": "https://1inch.io/", + "logoURI": "https://raw.githubusercontent.com/lifinance/types/main/src/assets/icons/exchanges/oneinch.png" + }, + { + "key": "openocean", + "name": "OpenOcean", + "url": "https://openocean.finance/", + "logoURI": "https://raw.githubusercontent.com/lifinance/types/main/src/assets/icons/exchanges/openocean.png" + }, + { + "key": "0x", + "name": "0x", + "url": "https://www.0x.org/", + "logoURI": "https://raw.githubusercontent.com/lifinance/types/main/src/assets/icons/exchanges/zerox.png" + }, + { + "key": "superfluid", + "name": "Superfluid", + "url": "https://www.superfluid.finance/", + "logoURI": "https://www.superfluid.finance/assets/favicon/favicon-32x32.png" + }, + { + "key": "uniswap", + "name": "UniswapV2", + "url": "https://uniswap.org/", + "logoURI": "https://raw.githubusercontent.com/lifinance/types/main/src/assets/icons/exchanges/uniswap.png" + }, + { + "key": "quickswap", + "name": "QuickSwap", + "url": "https://quickswap.exchange/", + "logoURI": "https://raw.githubusercontent.com/lifinance/types/main/src/assets/icons/exchanges/quick.png" + }, + { + "key": "pancakeswap", + "name": "PancakeSwap", + "url": "https://pancakeswap.finance/", + "logoURI": "https://raw.githubusercontent.com/lifinance/types/main/src/assets/icons/exchanges/pancake.png" + }, + { + "key": "honeyswap", + "name": "Honeyswap", + "url": "https://honeyswap.org/", + "logoURI": "https://raw.githubusercontent.com/lifinance/types/main/src/assets/icons/exchanges/honey.png" + }, + { + "key": "spookyswap", + "name": "SpookySwap", + "url": "https://spooky.fi/", + "logoURI": "https://raw.githubusercontent.com/lifinance/types/main/src/assets/icons/exchanges/spooky.png" + }, + { + "key": "spiritswap", + "name": "SpiritSwap", + "url": "https://www.spiritswap.finance/", + "logoURI": "https://github.com/Layer3Org/spiritswap-tokens-list-icon/blob/master/token-list/images/inspirit.png?raw=true" + }, + { + "key": "solarbeam", + "name": "Solarbeam", + "url": "https://solarbeam.io/", + "logoURI": "https://raw.githubusercontent.com/lifinance/types/main/src/assets/icons/exchanges/solarbeam.png" + }, + { + "key": "jswap", + "name": "JSwap", + "url": "https://app.jswap.finance/", + "logoURI": "https://raw.githubusercontent.com/lifinance/types/main/src/assets/icons/exchanges/jswap.png" + }, + { + "key": "cronaswap", + "name": "CronaSwap", + "url": "https://app.cronaswap.org/", + "logoURI": "https://raw.githubusercontent.com/lifinance/types/main/src/assets/icons/exchanges/cronaswap.png" + }, + { + "key": "voltage", + "name": "Voltage", + "url": "https://app.voltage.finance/", + "logoURI": "https://raw.githubusercontent.com/lifinance/types/main/src/assets/icons/exchanges/voltage.png" + }, + { + "key": "ubeswap", + "name": "UbeSwap", + "url": "https://ubeswap.org/", + "logoURI": "https://raw.githubusercontent.com/lifinance/types/main/src/assets/icons/exchanges/ubeswap.png" + }, + { + "key": "sushiswap", + "name": "SushiSwap", + "url": "https://sushi.com/", + "logoURI": "https://raw.githubusercontent.com/lifinance/types/main/src/assets/icons/exchanges/sushi.png" + } +] \ No newline at end of file diff --git a/app/src/main/cpp/keys.c b/app/src/main/cpp/keys.c index 8b29b00be5..6e64fa4f04 100644 --- a/app/src/main/cpp/keys.c +++ b/app/src/main/cpp/keys.c @@ -92,6 +92,19 @@ Java_com_alphawallet_app_repository_KeyProviderJNIImpl_getSecondaryInfuraKey( JN #endif } +JNIEXPORT jstring JNICALL +Java_com_alphawallet_app_repository_KeyProviderJNIImpl_getTertiaryInfuraKey( JNIEnv* env, jobject thiz ) +{ +#if (HAS_KEYS == 1) + return getDecryptedKey(env, tertiaryInfuraKey); +#elif (HAS_INFURA == 1) + return (*env)->NewStringUTF(env, IFKEY); +#else + const jstring key = "da3717f25f824cc1baa32d812386d93f"; + return (*env)->NewStringUTF(env, key); +#endif +} + JNIEXPORT jstring JNICALL Java_com_alphawallet_app_repository_KeyProviderJNIImpl_getKlaytnKey( JNIEnv* env, jobject thiz ) { @@ -182,3 +195,23 @@ Java_com_alphawallet_app_repository_KeyProviderJNIImpl_getOpenSeaKey( JNIEnv* en return (*env)->NewStringUTF(env, key); #endif } + +JNIEXPORT jstring JNICALL +Java_com_alphawallet_app_repository_KeyProviderJNIImpl_getWalletConnectProjectId( JNIEnv* env, jclass thiz ) +{ +#if (HAS_KEYS == 1) + return getDecryptedKey(env, walletConnectProjectId); +#else + return (*env)->NewStringUTF(env, WALLETCONNECT_PROJECT_ID); +#endif +} + +JNIEXPORT jstring JNICALL +Java_com_alphawallet_app_repository_KeyProviderJNIImpl_getInfuraSecret(JNIEnv *env, jobject thiz) { +#if (HAS_KEYS == 1) + return getDecryptedKey(env, infuraSecret); +#else + const jstring key = ""; + return (*env)->NewStringUTF(env, key); +#endif +} diff --git a/app/src/main/java/com/alphawallet/app/C.java b/app/src/main/java/com/alphawallet/app/C.java index 8c39765503..2a12c56bd8 100644 --- a/app/src/main/java/com/alphawallet/app/C.java +++ b/app/src/main/java/com/alphawallet/app/C.java @@ -57,8 +57,9 @@ public abstract class C { public static final String AURORA_TESTNET_NAME = "Aurora (Test)"; public static final String MILKOMEDA_NAME = "Milkomeda Cardano"; public static final String MILKOMEDA_TESTNET_NAME = "Milkomeda Cardano (Test)"; - public static final String PHI_NETWORK_NAME = "PHI"; - public static final String PHI_V2_NETWORK_NAME = "PHI v2"; + public static final String SEPOLIA_TESTNET_NAME = "Sepolia (Test)"; + public static final String OPTIMISM_GOERLI_TESTNET_NAME = "Optimism Goerli (Test)"; + public static final String ARBITRUM_GOERLI_TESTNET_NAME = "Arbitrum Goerli (Test)"; public static final String ETHEREUM_TICKER_NAME = "ethereum"; public static final String CLASSIC_TICKER_NAME = "ethereum-classic"; @@ -91,7 +92,9 @@ public abstract class C { public static final String IOTEX_SYMBOL = "IOTX"; public static final String MILKOMEDA_SYMBOL = "milkADA"; public static final String MILKOMEDA_TEST_SYMBOL = "milktADA"; - public static final String PHI_NETWORK_SYMBOL = "\u03d5"; + public static final String SEPOLIA_SYMBOL = "ETH"; + public static final String OPTIMISM_GOERLI_TEST_SYMBOL = "ETH"; + public static final String ARBITRUM_GOERLI_TEST_SYMBOL = "AGOR"; public static final String BURN_ADDRESS = "0x0000000000000000000000000000000000000000"; @@ -321,13 +324,6 @@ public enum TokenStatus { public static final String OPENSEA_SINGLE_ASSET_API_RINKEBY = "https://testnets-api.opensea.io/api/v1/asset/"; public static final String OPENSEA_SINGLE_ASSET_API_MATIC = "https://api.opensea.io/api/v2/metadata/matic/"; - // Progress Info - public interface ProgressInfo { - int FETCHING_CHAINS = 1; - int FETCHING_CONNECTIONS = 2; - int FETCHING_QUOTE = 3; - } - //Timing public static long CONNECT_TIMEOUT = 10; //Seconds public static long READ_TIMEOUT = 10; diff --git a/app/src/main/java/com/alphawallet/app/di/RepositoriesModule.java b/app/src/main/java/com/alphawallet/app/di/RepositoriesModule.java index 127d9e6be5..f8afae90f0 100644 --- a/app/src/main/java/com/alphawallet/app/di/RepositoriesModule.java +++ b/app/src/main/java/com/alphawallet/app/di/RepositoriesModule.java @@ -12,6 +12,8 @@ import com.alphawallet.app.repository.OnRampRepositoryType; import com.alphawallet.app.repository.PreferenceRepositoryType; import com.alphawallet.app.repository.SharedPreferenceRepository; +import com.alphawallet.app.repository.SwapRepository; +import com.alphawallet.app.repository.SwapRepositoryType; import com.alphawallet.app.repository.TokenLocalSource; import com.alphawallet.app.repository.TokenRepository; import com.alphawallet.app.repository.TokenRepositoryType; @@ -29,6 +31,8 @@ import com.alphawallet.app.service.AnalyticsServiceType; import com.alphawallet.app.service.AssetDefinitionService; import com.alphawallet.app.service.GasService; +import com.alphawallet.app.service.IPFSService; +import com.alphawallet.app.service.IPFSServiceType; import com.alphawallet.app.service.KeyService; import com.alphawallet.app.service.KeystoreAccountService; import com.alphawallet.app.service.NotificationService; @@ -55,38 +59,42 @@ @Module @InstallIn(SingletonComponent.class) -public class RepositoriesModule { - @Singleton - @Provides - PreferenceRepositoryType providePreferenceRepository(@ApplicationContext Context context) { - return new SharedPreferenceRepository(context); - } +public class RepositoriesModule +{ + @Singleton + @Provides + PreferenceRepositoryType providePreferenceRepository(@ApplicationContext Context context) + { + return new SharedPreferenceRepository(context); + } - @Singleton - @Provides - AccountKeystoreService provideAccountKeyStoreService(@ApplicationContext Context context, KeyService keyService) { + @Singleton + @Provides + AccountKeystoreService provideAccountKeyStoreService(@ApplicationContext Context context, KeyService keyService) + { File file = new File(context.getFilesDir(), KEYSTORE_FOLDER); - return new KeystoreAccountService(file, context.getFilesDir(), keyService); - } + return new KeystoreAccountService(file, context.getFilesDir(), keyService); + } - @Singleton + @Singleton @Provides - TickerService provideTickerService(OkHttpClient httpClient, PreferenceRepositoryType sharedPrefs, TokenLocalSource localSource) { - return new TickerService(httpClient, sharedPrefs, localSource); + TickerService provideTickerService(OkHttpClient httpClient, PreferenceRepositoryType sharedPrefs, TokenLocalSource localSource) + { + return new TickerService(httpClient, sharedPrefs, localSource); } - @Singleton - @Provides - EthereumNetworkRepositoryType provideEthereumNetworkRepository( + @Singleton + @Provides + EthereumNetworkRepositoryType provideEthereumNetworkRepository( PreferenceRepositoryType preferenceRepository, - @ApplicationContext Context context - ) + @ApplicationContext Context context + ) { return new EthereumNetworkRepository(preferenceRepository, context); } - @Singleton - @Provides + @Singleton + @Provides WalletRepositoryType provideWalletRepository( PreferenceRepositoryType preferenceRepositoryType, AccountKeystoreService accountKeystoreService, @@ -119,13 +127,22 @@ OnRampRepositoryType provideOnRampRepository(@ApplicationContext Context context @Singleton @Provides - CoinbasePayRepositoryType provideCoinbasePayRepository() { + SwapRepositoryType provideSwapRepository(@ApplicationContext Context context) + { + return new SwapRepository(context); + } + + @Singleton + @Provides + CoinbasePayRepositoryType provideCoinbasePayRepository() + { return new CoinbasePayRepository(); } - @Singleton + @Singleton @Provides - TransactionLocalSource provideTransactionInDiskCache(RealmManager realmManager) { + TransactionLocalSource provideTransactionInDiskCache(RealmManager realmManager) + { return new TransactionsRealmCache(realmManager); } @@ -139,105 +156,120 @@ TransactionsNetworkClientType provideBlockExplorerClient( return new TransactionsNetworkClient(httpClient, gson, realmManager); } - @Singleton + @Singleton @Provides TokenRepositoryType provideTokenRepository( EthereumNetworkRepositoryType ethereumNetworkRepository, TokenLocalSource tokenLocalSource, - OkHttpClient httpClient, - @ApplicationContext Context context, - TickerService tickerService) { - return new TokenRepository( - ethereumNetworkRepository, - tokenLocalSource, - httpClient, - context, - tickerService); + OkHttpClient httpClient, + @ApplicationContext Context context, + TickerService tickerService) + { + return new TokenRepository( + ethereumNetworkRepository, + tokenLocalSource, + httpClient, + context, + tickerService); } @Singleton @Provides - TokenLocalSource provideRealmTokenSource(RealmManager realmManager, EthereumNetworkRepositoryType ethereumNetworkRepository) { - return new TokensRealmSource(realmManager, ethereumNetworkRepository); + TokenLocalSource provideRealmTokenSource(RealmManager realmManager, EthereumNetworkRepositoryType ethereumNetworkRepository) + { + return new TokensRealmSource(realmManager, ethereumNetworkRepository); } - @Singleton - @Provides - WalletDataRealmSource provideRealmWalletDataSource(RealmManager realmManager) { - return new WalletDataRealmSource(realmManager); - } + @Singleton + @Provides + WalletDataRealmSource provideRealmWalletDataSource(RealmManager realmManager) + { + return new WalletDataRealmSource(realmManager); + } - @Singleton - @Provides - TokensService provideTokensService(EthereumNetworkRepositoryType ethereumNetworkRepository, - TokenRepositoryType tokenRepository, - TickerService tickerService, - OpenSeaService openseaService, - AnalyticsServiceType analyticsService) { - return new TokensService(ethereumNetworkRepository, tokenRepository, tickerService, openseaService, analyticsService); - } + @Singleton + @Provides + TokensService provideTokensServices(EthereumNetworkRepositoryType ethereumNetworkRepository, + TokenRepositoryType tokenRepository, + TickerService tickerService, + OpenSeaService openseaService, + AnalyticsServiceType analyticsService) + { + return new TokensService(ethereumNetworkRepository, tokenRepository, tickerService, openseaService, analyticsService); + } - @Singleton - @Provides - TransactionsService provideTransactionsService(TokensService tokensService, - EthereumNetworkRepositoryType ethereumNetworkRepositoryType, - TransactionsNetworkClientType transactionsNetworkClientType, - TransactionLocalSource transactionLocalSource) { - return new TransactionsService(tokensService, ethereumNetworkRepositoryType, transactionsNetworkClientType, transactionLocalSource); - } + @Singleton + @Provides + TransactionsService provideTransactionsServices(TokensService tokensService, + EthereumNetworkRepositoryType ethereumNetworkRepositoryType, + TransactionsNetworkClientType transactionsNetworkClientType, + TransactionLocalSource transactionLocalSource) + { + return new TransactionsService(tokensService, ethereumNetworkRepositoryType, transactionsNetworkClientType, transactionLocalSource); + } @Singleton @Provides - GasService provideGasService(EthereumNetworkRepositoryType ethereumNetworkRepository, - OkHttpClient client, - RealmManager realmManager) + GasService provideGasService(EthereumNetworkRepositoryType ethereumNetworkRepository, OkHttpClient client, RealmManager realmManager) { return new GasService(ethereumNetworkRepository, client, realmManager); } - @Singleton - @Provides - OpenSeaService provideOpenseaService() { - return new OpenSeaService(); - } + @Singleton + @Provides + OpenSeaService provideOpenseaService() + { + return new OpenSeaService(); + } - @Singleton - @Provides - SwapService provideSwapService() { - return new SwapService(); - } + @Singleton + @Provides + SwapService provideSwapService() + { + return new SwapService(); + } - @Singleton - @Provides - AlphaWalletService provideFeemasterService(OkHttpClient okHttpClient, - TransactionRepositoryType transactionRepository, - Gson gson) { - return new AlphaWalletService(okHttpClient, transactionRepository, gson); - } + @Singleton + @Provides + AlphaWalletService provideFeemasterService(OkHttpClient okHttpClient, TransactionRepositoryType transactionRepository, Gson gson) + { + return new AlphaWalletService(okHttpClient, transactionRepository, gson); + } - @Singleton - @Provides - NotificationService provideNotificationService(@ApplicationContext Context ctx) { - return new NotificationService(ctx); - } + @Singleton + @Provides + NotificationService provideNotificationService(@ApplicationContext Context ctx) + { + return new NotificationService(ctx); + } - @Singleton - @Provides - AssetDefinitionService provideAssetDefinitionService(OkHttpClient okHttpClient, @ApplicationContext Context ctx, NotificationService notificationService, RealmManager realmManager, - TokensService tokensService, TokenLocalSource tls, TransactionRepositoryType trt, - AlphaWalletService alphaService) { - return new AssetDefinitionService(okHttpClient, ctx, notificationService, realmManager, tokensService, tls, trt, alphaService); - } + @Singleton + @Provides + AssetDefinitionService providingAssetDefinitionServices(IPFSServiceType ipfsService, @ApplicationContext Context ctx, NotificationService notificationService, RealmManager realmManager, + TokensService tokensService, TokenLocalSource tls, + AlphaWalletService alphaService) + { + return new AssetDefinitionService(ipfsService, ctx, notificationService, realmManager, tokensService, tls, alphaService); + } - @Singleton - @Provides - KeyService provideKeyService(@ApplicationContext Context ctx, AnalyticsServiceType analyticsService) { - return new KeyService(ctx, analyticsService); - } + @Singleton + @Provides + KeyService provideKeyService(@ApplicationContext Context ctx, AnalyticsServiceType analyticsService) + { + return new KeyService(ctx, analyticsService); + } - @Singleton - @Provides - AnalyticsServiceType provideAnalyticsService(@ApplicationContext Context ctx) { - return new AnalyticsService(ctx); - } + @Singleton + @Provides + AnalyticsServiceType provideAnalyticsService(@ApplicationContext Context ctx) + { + return new AnalyticsService(ctx); + } + + @Singleton + @Provides + IPFSServiceType provideIPFSService(OkHttpClient client) + { + return new IPFSService(client); + } } diff --git a/app/src/main/java/com/alphawallet/app/entity/CoinGeckoTicker.java b/app/src/main/java/com/alphawallet/app/entity/CoinGeckoTicker.java index a2087a1722..cb3087f3d2 100644 --- a/app/src/main/java/com/alphawallet/app/entity/CoinGeckoTicker.java +++ b/app/src/main/java/com/alphawallet/app/entity/CoinGeckoTicker.java @@ -45,11 +45,15 @@ public static List buildTickerList(String jsonData, String curr fiatPrice = obj.getDouble(currencyIsoSymbol.toLowerCase()); fiatChangeStr = obj.getString(currencyIsoSymbol.toLowerCase() + "_24h_change"); } - else + else if (obj.has("usd")) { fiatPrice = obj.getDouble("usd") * currentConversionRate; fiatChangeStr = obj.getString("usd_24h_change"); } + else + { + continue; //handle empty/corrupt returns + } res.add(new CoinGeckoTicker(address, fiatPrice, getFiatChange(fiatChangeStr))); } diff --git a/app/src/main/java/com/alphawallet/app/entity/ContractInteract.java b/app/src/main/java/com/alphawallet/app/entity/ContractInteract.java index 9bc532e363..bdfaf2a92d 100644 --- a/app/src/main/java/com/alphawallet/app/entity/ContractInteract.java +++ b/app/src/main/java/com/alphawallet/app/entity/ContractInteract.java @@ -7,6 +7,7 @@ import com.alphawallet.app.C; import com.alphawallet.app.entity.nftassets.NFTAsset; import com.alphawallet.app.entity.tokens.Token; +import com.alphawallet.app.service.IPFSService; import com.alphawallet.app.util.Utils; import org.web3j.abi.TypeReference; @@ -22,8 +23,6 @@ import io.reactivex.Single; import io.reactivex.schedulers.Schedulers; import okhttp3.OkHttpClient; -import okhttp3.Request; -import timber.log.Timber; /** * Created by JB on 7/05/2022. @@ -31,7 +30,7 @@ public class ContractInteract { private final Token token; - protected static OkHttpClient client; + protected static IPFSService client; public ContractInteract(Token token) { @@ -55,21 +54,7 @@ private String loadMetaData(String tokenURI) setupClient(); - Request request = new Request.Builder() - .url(Utils.parseIPFS(tokenURI)) - .get() - .build(); - - try (okhttp3.Response response = client.newCall(request).execute()) - { - return response.body().string(); - } - catch (Exception e) - { - Timber.e(e); - } - - return ""; + return client.getContent(tokenURI); } public NFTAsset fetchTokenMetadata(BigInteger tokenId) @@ -112,12 +97,13 @@ private static void setupClient() { if (client == null) { - client = new OkHttpClient.Builder() - .connectTimeout(C.CONNECT_TIMEOUT*4, TimeUnit.SECONDS) - .readTimeout(C.READ_TIMEOUT*4, TimeUnit.SECONDS) - .writeTimeout(C.WRITE_TIMEOUT, TimeUnit.SECONDS) - .retryOnConnectionFailure(true) - .build(); + client = new IPFSService( + new OkHttpClient.Builder() + .connectTimeout(C.CONNECT_TIMEOUT*2, TimeUnit.SECONDS) + .readTimeout(C.READ_TIMEOUT*2, TimeUnit.SECONDS) + .writeTimeout(C.WRITE_TIMEOUT*2, TimeUnit.SECONDS) + .retryOnConnectionFailure(false) + .build()); } } } diff --git a/app/src/main/java/com/alphawallet/app/entity/EventSync.java b/app/src/main/java/com/alphawallet/app/entity/EventSync.java index 1d600a7617..be7798b630 100644 --- a/app/src/main/java/com/alphawallet/app/entity/EventSync.java +++ b/app/src/main/java/com/alphawallet/app/entity/EventSync.java @@ -34,6 +34,10 @@ public class EventSync { public static final long BLOCK_SEARCH_INTERVAL = 100000L; + public static final long POLYGON_BLOCK_SEARCH_INTERVAL = 10000L; + + private static final String TAG = "EVENT_SYNC"; + private static final boolean EVENT_SYNC_DEBUGGING = false; private final Token token; @@ -71,8 +75,17 @@ public SyncDef getSyncDef(Realm realm) case DOWNWARD_SYNC_START: //Start event sync, optimistically try the whole current event range from 1 -> LATEST eventReadStartBlock = BigInteger.ONE; eventReadEndBlock = BigInteger.valueOf(-1L); - //write the start point here - writeStartSyncBlock(realm, currentBlock.longValue()); + if (EthereumNetworkBase.isEventBlockLimitEnforced(token.tokenInfo.chainId)) + { + syncState = EventSyncState.UPWARD_SYNC; + eventReadStartBlock = currentBlock.subtract(EthereumNetworkBase.getMaxEventFetch(token.tokenInfo.chainId).multiply(BigInteger.valueOf(3))); + EVENT_DEBUG("Init Sync for restricted block RPC"); + } + else + { + //write the start point here + writeStartSyncBlock(realm, currentBlock.longValue()); + } break; case DOWNWARD_SYNC: //we needed to slow down the sync eventReadStartBlock = lastBlockRead.subtract(BigInteger.valueOf(readBlockSize)); @@ -85,19 +98,85 @@ public SyncDef getSyncDef(Realm realm) break; case UPWARD_SYNC_MAX: //we are syncing from the point we started the downward sync upwardSync = true; + if (EthereumNetworkBase.isEventBlockLimitEnforced(token.tokenInfo.chainId) && upwardSyncStateLost(lastBlockRead, currentBlock)) + { + syncState = EventSyncState.UPWARD_SYNC; + EVENT_DEBUG("Switch back to sync scan"); + } + eventReadStartBlock = lastBlockRead; eventReadEndBlock = BigInteger.valueOf(-1L); break; case UPWARD_SYNC: //we encountered upward sync issues upwardSync = true; eventReadStartBlock = lastBlockRead; - eventReadEndBlock = lastBlockRead.add(BigInteger.valueOf(readBlockSize)); + if (upwardSyncComplete(eventReadStartBlock, currentBlock)) //detect completion of upward sync and switch to sync_max + { + eventReadEndBlock = BigInteger.valueOf(-1L); + syncState = EventSyncState.UPWARD_SYNC_MAX; + EVENT_DEBUG("Sync complete"); + } + else + { + eventReadEndBlock = lastBlockRead.add(BigInteger.valueOf(readBlockSize)); + } break; } + // Finally adjust the event end read if required. This is placed outside the switch because it should affect + // a few different paths + eventReadEndBlock = adjustForLimitedBlockSize(eventReadStartBlock, eventReadEndBlock, currentBlock); + + // detect edge condition - it's highly unlikely but acts as a stopper in case of unexpected results + // This edge condition is where the start block read is greater than the current block. + if (eventReadStartBlock.compareTo(currentBlock) >= 0) + { + eventReadStartBlock = currentBlock.subtract(BigInteger.ONE); + eventReadEndBlock = BigInteger.valueOf(-1L); + syncState = EventSyncState.UPWARD_SYNC_MAX; + } + return new SyncDef(eventReadStartBlock, eventReadEndBlock, syncState, upwardSync); } + private void EVENT_DEBUG(String message) + { + if (EVENT_SYNC_DEBUGGING) + { + Timber.tag(TAG).i(token.tokenInfo.chainId + " " + token.tokenInfo.address + ": " + message); + } + } + + private boolean upwardSyncStateLost(BigInteger lastBlockRead, BigInteger currentBlock) + { + return currentBlock.subtract(lastBlockRead).compareTo(EthereumNetworkBase.getMaxEventFetch(token.tokenInfo.chainId)) >= 0; + } + + private boolean upwardSyncComplete(BigInteger eventReadStartBlock, BigInteger currentBlock) + { + BigInteger maxBlockRead = EthereumNetworkBase.getMaxEventFetch(token.tokenInfo.chainId).subtract(BigInteger.ONE); + BigInteger diff = currentBlock.subtract(eventReadStartBlock); + + return diff.compareTo(maxBlockRead) < 0; + } + + private BigInteger adjustForLimitedBlockSize(BigInteger eventReadStartBlock, BigInteger eventReadEndBlock, BigInteger currentBlock) + { + if (EthereumNetworkBase.isEventBlockLimitEnforced(token.tokenInfo.chainId)) + { + BigInteger maxBlockRead = EthereumNetworkBase.getMaxEventFetch(token.tokenInfo.chainId); + + long diff = currentBlock.subtract(eventReadStartBlock).longValue(); + + if (diff >= maxBlockRead.longValue()) + { + return eventReadStartBlock.add(maxBlockRead).subtract(BigInteger.ONE); + } + } + + return eventReadEndBlock; + } + public boolean handleEthLogError(Response.Error error, DefaultBlockParameter startBlock, DefaultBlockParameter endBlock, SyncDef sync, Realm realm) { if (error.getCode() == -32005) @@ -177,6 +256,11 @@ private long reduceBlockSearch(long currentBlock, BigInteger startBlock) private long getCurrentEventBlockSize(Realm instance) { + if (EthereumNetworkBase.getMaxEventFetch(token.tokenInfo.chainId).equals(BigInteger.valueOf(3500L))) + { + return EthereumNetworkBase.getMaxEventFetch(token.tokenInfo.chainId).longValue(); + } + RealmAuxData rd = instance.where(RealmAuxData.class) .equalTo("instanceKey", TokensRealmSource.databaseKey(token.tokenInfo.chainId, token.getAddress())) .findFirst(); @@ -205,8 +289,9 @@ protected EventSyncState getCurrentTokenSyncState(Realm instance) else { int state = rd.getTokenId().intValue(); - if (state >= EventSyncState.DOWNWARD_SYNC_START.ordinal() || state < EventSyncState.TOP_LIMIT.ordinal()) + if (state >= EventSyncState.DOWNWARD_SYNC_START.ordinal() && state < EventSyncState.TOP_LIMIT.ordinal()) { + EVENT_DEBUG("Read State: " + EventSyncState.values()[state]); return EventSyncState.values()[state]; } else @@ -248,6 +333,7 @@ protected long getLastEventRead(Realm instance) } else { + EVENT_DEBUG("ReadEventSync: " + rd.getResultTime()); return rd.getResultTime(); } } @@ -333,6 +419,8 @@ private void updateEventReads(Realm realm, long lastRead, long readInterval, Eve rd.setResultReceivedTime(readInterval); rd.setTokenId(String.valueOf(state.ordinal())); + EVENT_DEBUG("WriteState: " + state + " " + lastRead); + r.insertOrUpdate(rd); }); } @@ -340,7 +428,7 @@ private void updateEventReads(Realm realm, long lastRead, long readInterval, Eve // If we're syncing downwards, work out what event block size we should read next private long calcNewIntervalSize(SyncDef sync, int evReads) { - if (sync.upwardSync) return BLOCK_SEARCH_INTERVAL; + if (sync.upwardSync) return EthereumNetworkBase.getMaxEventFetch(token.tokenInfo.chainId).longValue(); long endBlock = sync.eventReadEndBlock.longValue() == -1 ? TransactionsService.getCurrentBlock(token.tokenInfo.chainId).longValue() : sync.eventReadEndBlock.longValue(); long currentReadSize = endBlock - sync.eventReadStartBlock.longValue(); @@ -357,7 +445,7 @@ else if (evReads < 1000) } else if ((maxLogReads - evReads) > maxLogReads*0.25) { - currentReadSize += BLOCK_SEARCH_INTERVAL; + currentReadSize += EthereumNetworkBase.getMaxEventFetch(token.tokenInfo.chainId).longValue(); } return currentReadSize; @@ -365,6 +453,8 @@ else if ((maxLogReads - evReads) > maxLogReads*0.25) /*** * Event Handling + * + * TODO: batch up catch-up calls */ public Pair, HashSet>> processTransferEvents(Web3j web3j, Event transferEvent, DefaultBlockParameter startBlock, diff --git a/app/src/main/java/com/alphawallet/app/entity/QueryResponse.java b/app/src/main/java/com/alphawallet/app/entity/QueryResponse.java new file mode 100644 index 0000000000..a232a2f2db --- /dev/null +++ b/app/src/main/java/com/alphawallet/app/entity/QueryResponse.java @@ -0,0 +1,23 @@ +package com.alphawallet.app.entity; + +/** + * Created by JB on 5/11/2022. + */ +public class QueryResponse +{ + public final int code; + public final String body; + + public QueryResponse(int code, String body) + { + this.code = code; + this.body = body; + } + + public boolean isSuccessful() + { + return code >= 200 && code <= 299; + } +} + + diff --git a/app/src/main/java/com/alphawallet/app/entity/Transaction.java b/app/src/main/java/com/alphawallet/app/entity/Transaction.java index 91e54e05d6..18037a924c 100644 --- a/app/src/main/java/com/alphawallet/app/entity/Transaction.java +++ b/app/src/main/java/com/alphawallet/app/entity/Transaction.java @@ -28,14 +28,13 @@ import java.util.Map; /** - * * This is supposed to be a generic transaction class which can * contain all of 3 stages of a transaction: - * + *

* 1. being compiled, in progress, or ready to be signed; * 2. compiled and signed, or ready to be broadcasted; - * 2. already broadcasted, obtained in its raw format from a node, - * including the signatures in it; + * 2. already broadcasted, obtained in its raw format from a node, + * including the signatures in it; * 4. already included in a blockchain. */ public class Transaction implements Parcelable @@ -61,654 +60,666 @@ public class Transaction implements Parcelable public TransactionInput transactionInput = null; public static final String CONSTRUCTOR = "Constructor"; - public static final TransactionDecoder decoder = new TransactionDecoder(); - public static ParseMagicLink parser = null; - - //placeholder for error - public Transaction() - { - //blank transaction - hash = ""; - blockNumber = ""; - timeStamp = 0; - nonce = 0; - from = ""; - to = ""; - value = ""; - gas = ""; - gasPrice = ""; - gasUsed = ""; - input = ""; - error = ""; - chainId = 0; - maxFeePerGas = ""; - maxPriorityFee = ""; - } - - public boolean isPending() - { - return TextUtils.isEmpty(blockNumber) || blockNumber.equals("0") || blockNumber.equals("-2"); - } - - public boolean hasError() - { - return !TextUtils.isEmpty(error) && error.equals("1"); - } - - public boolean hasData() - { - return !TextUtils.isEmpty(input) && input.length() > 2; - } + public static final TransactionDecoder decoder = new TransactionDecoder(); + public static ParseMagicLink parser = null; + + //placeholder for error + public Transaction() + { + //blank transaction + hash = ""; + blockNumber = ""; + timeStamp = 0; + nonce = 0; + from = ""; + to = ""; + value = ""; + gas = ""; + gasPrice = ""; + gasUsed = ""; + input = ""; + error = ""; + chainId = 0; + maxFeePerGas = ""; + maxPriorityFee = ""; + } + + public boolean isPending() + { + return TextUtils.isEmpty(blockNumber) || blockNumber.equals("0") || blockNumber.equals("-2"); + } + + public boolean hasError() + { + return !TextUtils.isEmpty(error) && error.equals("1"); + } + + public boolean hasData() + { + return !TextUtils.isEmpty(input) && input.length() > 2; + } public Transaction( String hash, String error, String blockNumber, long timeStamp, - int nonce, - String from, - String to, - String value, - String gas, - String gasPrice, - String input, - String gasUsed, + int nonce, + String from, + String to, + String value, + String gas, + String gasPrice, + String input, + String gasUsed, long chainId, - boolean isConstructor) { + boolean isConstructor) + { this.hash = hash; this.error = error; this.blockNumber = blockNumber; this.timeStamp = timeStamp; - this.nonce = nonce; - this.from = from; - this.to = to; - this.value = value; - this.gas = gas; - this.gasPrice = gasPrice; - this.input = input; - this.gasUsed = gasUsed; - this.chainId = chainId; - this.isConstructor = isConstructor; - this.maxFeePerGas = ""; - this.maxPriorityFee = ""; - } - - public Transaction(Web3Transaction tx, long chainId, String wallet) - { - this.hash = null; - this.error = null; - this.blockNumber = null; - this.timeStamp = System.currentTimeMillis()/1000; - this.nonce = -1; - this.from = wallet; - this.to = tx.recipient.toString(); - this.value = tx.value.toString(); - this.gas = tx.gasLimit.toString(); - this.gasPrice = tx.gasPrice.toString(); - this.input = tx.payload; - this.gasUsed = tx.gasLimit.toString(); - this.chainId = chainId; - this.isConstructor = tx.isConstructor(); - this.maxFeePerGas = tx.maxFeePerGas.toString(); - this.maxPriorityFee = tx.maxPriorityFeePerGas.toString(); - } - - public Transaction(CovalentTransaction cTx, long chainId, long transactionTime) - { - if (cTx.to_address == null || cTx.to_address.equals("null")) - { - isConstructor = true; - input = CONSTRUCTOR; - //determine creation address from events - to = cTx.determineContractAddress(); - } - else - { - to = cTx.to_address; - input = "0x"; - } - - this.hash = cTx.tx_hash; - this.blockNumber = cTx.block_height; - this.timeStamp = transactionTime; - this.error = cTx.successful ? "0" : "1"; - this.nonce = 0; //don't know this - this.from = cTx.from_address; - this.value = cTx.value; - this.gas = String.valueOf(cTx.gas_offered); - this.gasPrice = cTx.gas_price; - this.gasUsed = cTx.gas_spent; - this.chainId = chainId; - this.maxFeePerGas = ""; - this.maxPriorityFee = ""; - } - - public Transaction(org.web3j.protocol.core.methods.response.Transaction ethTx, long chainId, boolean isSuccess, long timeStamp) - { - // Get contract address if constructor - String contractAddress = ethTx.getCreates() != null ? ethTx.getCreates() : ""; - int nonce = ethTx.getNonceRaw() != null ? Numeric.toBigInt(ethTx.getNonceRaw()).intValue() : 0; - - if (!TextUtils.isEmpty(contractAddress)) //must be a constructor - { - to = contractAddress; - isConstructor = true; - input = CONSTRUCTOR; - } - else if (ethTx.getTo() == null && ethTx.getInput() != null && ethTx.getInput().startsWith("0x60")) - { - // some clients don't populate the 'creates' data for constructors. Note: Ethereum constructor always starts with a 'PUSH' 0x60 instruction - input = CONSTRUCTOR; - isConstructor = true; - to = calculateContractAddress(ethTx.getFrom(), nonce); - } - else - { - this.to = ethTx.getTo() != null ? ethTx.getTo() : ""; - this.input = ethTx.getInput(); - } - - this.hash = ethTx.getHash(); - this.blockNumber = ethTx.getBlockNumber().toString(); - this.timeStamp = timeStamp; - this.error = isSuccess ? "0" : "1"; - this.nonce = nonce; - this.from = ethTx.getFrom(); - this.value = ethTx.getValue().toString(); - this.gas = ethTx.getGas().toString(); - this.gasPrice = ethTx.getGasPrice().toString(); - this.gasUsed = ethTx.getGas().toString(); - this.chainId = chainId; - this.maxFeePerGas = ethTx.getMaxFeePerGas(); - this.maxPriorityFee = ethTx.getMaxPriorityFeePerGas(); - } - - public Transaction(String hash, String isError, String blockNumber, long timeStamp, int nonce, String from, String to, - String value, String gas, String gasPrice, String input, String gasUsed, long chainId, String contractAddress) - { - //Is it a constructor? - if (!TextUtils.isEmpty(contractAddress)) - { - String testContractDeploymentAddress = Utils.calculateContractAddress(from, nonce); - if (testContractDeploymentAddress.equalsIgnoreCase(contractAddress)) - { - to = contractAddress; - isConstructor = true; - input = CONSTRUCTOR; - } - } - - this.to = to; - this.hash = hash; - this.error = isError; - this.blockNumber = blockNumber; - this.timeStamp = timeStamp; - this.nonce = nonce; - this.from = from; - this.value = value; - this.gas = gas; - this.gasPrice = gasPrice; - this.input = input; - this.gasUsed = gasUsed; - this.chainId = chainId; - this.maxFeePerGas = ""; - this.maxPriorityFee = ""; - } - - public Transaction(String hash, String isError, String blockNumber, long timeStamp, int nonce, String from, String to, - String value, String gas, String gasPrice, String maxFeePerGas, String maxPriorityFee, String input, String gasUsed, long chainId, String contractAddress) - { - if (!TextUtils.isEmpty(contractAddress)) - { - String testContractDeploymentAddress = Utils.calculateContractAddress(from, nonce); - if (testContractDeploymentAddress.equalsIgnoreCase(contractAddress)) - { - to = contractAddress; - isConstructor = true; - input = CONSTRUCTOR; - } - } - - this.to = to; - this.hash = hash; - this.error = isError; - this.blockNumber = blockNumber; - this.timeStamp = timeStamp; - this.nonce = nonce; - this.from = from; - this.value = value; - this.gas = gas; - this.maxFeePerGas = maxFeePerGas; - this.maxPriorityFee = maxPriorityFee; - this.gasPrice = gasPrice; - this.input = input; - this.gasUsed = gasUsed; - this.chainId = chainId; - } - - protected Transaction(Parcel in) - { - hash = in.readString(); - error = in.readString(); - blockNumber = in.readString(); - timeStamp = in.readLong(); - nonce = in.readInt(); - from = in.readString(); - to = in.readString(); - value = in.readString(); - gas = in.readString(); - gasPrice = in.readString(); - input = in.readString(); - gasUsed = in.readString(); - chainId = in.readLong(); - maxFeePerGas = in.readString(); - maxPriorityFee = in.readString(); - } - - public static final Creator CREATOR = new Creator() { - @Override - public Transaction createFromParcel(Parcel in) { - return new Transaction(in); - } - - @Override - public Transaction[] newArray(int size) { - return new Transaction[size]; - } - }; - - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel(Parcel dest, int flags) { + this.nonce = nonce; + this.from = from; + this.to = to; + this.value = value; + this.gas = gas; + this.gasPrice = gasPrice; + this.input = input; + this.gasUsed = gasUsed; + this.chainId = chainId; + this.isConstructor = isConstructor; + this.maxFeePerGas = ""; + this.maxPriorityFee = ""; + } + + public Transaction(Web3Transaction tx, long chainId, String wallet) + { + this.hash = null; + this.error = null; + this.blockNumber = null; + this.timeStamp = System.currentTimeMillis() / 1000; + this.nonce = -1; + this.from = wallet; + this.to = tx.recipient.toString(); + this.value = tx.value.toString(); + this.gas = tx.gasLimit.toString(); + this.gasPrice = tx.gasPrice.toString(); + this.input = tx.payload; + this.gasUsed = tx.gasLimit.toString(); + this.chainId = chainId; + this.isConstructor = tx.isConstructor(); + this.maxFeePerGas = tx.maxFeePerGas.toString(); + this.maxPriorityFee = tx.maxPriorityFeePerGas.toString(); + } + + public Transaction(CovalentTransaction cTx, long chainId, long transactionTime) + { + if (cTx.to_address == null || cTx.to_address.equals("null")) + { + isConstructor = true; + input = CONSTRUCTOR; + //determine creation address from events + to = cTx.determineContractAddress(); + } + else + { + to = cTx.to_address; + input = "0x"; + } + + this.hash = cTx.tx_hash; + this.blockNumber = cTx.block_height; + this.timeStamp = transactionTime; + this.error = cTx.successful ? "0" : "1"; + this.nonce = 0; //don't know this + this.from = cTx.from_address; + this.value = cTx.value; + this.gas = String.valueOf(cTx.gas_offered); + this.gasPrice = cTx.gas_price; + this.gasUsed = cTx.gas_spent; + this.chainId = chainId; + this.maxFeePerGas = ""; + this.maxPriorityFee = ""; + } + + public Transaction(org.web3j.protocol.core.methods.response.Transaction ethTx, long chainId, boolean isSuccess, long timeStamp) + { + // Get contract address if constructor + String contractAddress = ethTx.getCreates() != null ? ethTx.getCreates() : ""; + int nonce = ethTx.getNonceRaw() != null ? Numeric.toBigInt(ethTx.getNonceRaw()).intValue() : 0; + + if (!TextUtils.isEmpty(contractAddress)) //must be a constructor + { + to = contractAddress; + isConstructor = true; + input = CONSTRUCTOR; + } + else if (ethTx.getTo() == null && ethTx.getInput() != null && ethTx.getInput().startsWith("0x60")) + { + // some clients don't populate the 'creates' data for constructors. Note: Ethereum constructor always starts with a 'PUSH' 0x60 instruction + input = CONSTRUCTOR; + isConstructor = true; + to = calculateContractAddress(ethTx.getFrom(), nonce); + } + else + { + this.to = ethTx.getTo() != null ? ethTx.getTo() : ""; + this.input = ethTx.getInput(); + } + + this.hash = ethTx.getHash(); + this.blockNumber = ethTx.getBlockNumber().toString(); + this.timeStamp = timeStamp; + this.error = isSuccess ? "0" : "1"; + this.nonce = nonce; + this.from = ethTx.getFrom(); + this.value = ethTx.getValue().toString(); + this.gas = ethTx.getGas().toString(); + this.gasPrice = ethTx.getGasPrice().toString(); + this.gasUsed = ethTx.getGas().toString(); + this.chainId = chainId; + this.maxFeePerGas = ethTx.getMaxFeePerGas(); + this.maxPriorityFee = ethTx.getMaxPriorityFeePerGas(); + } + + public Transaction(String hash, String isError, String blockNumber, long timeStamp, int nonce, String from, String to, + String value, String gas, String gasPrice, String input, String gasUsed, long chainId, String contractAddress) + { + //Is it a constructor? + if (!TextUtils.isEmpty(contractAddress)) + { + String testContractDeploymentAddress = Utils.calculateContractAddress(from, nonce); + if (testContractDeploymentAddress.equalsIgnoreCase(contractAddress)) + { + to = contractAddress; + isConstructor = true; + input = CONSTRUCTOR; + } + } + + this.to = to; + this.hash = hash; + this.error = isError; + this.blockNumber = blockNumber; + this.timeStamp = timeStamp; + this.nonce = nonce; + this.from = from; + this.value = value; + this.gas = gas; + this.gasPrice = gasPrice; + this.input = input; + this.gasUsed = gasUsed; + this.chainId = chainId; + this.maxFeePerGas = ""; + this.maxPriorityFee = ""; + } + + public Transaction(String hash, String isError, String blockNumber, long timeStamp, int nonce, String from, String to, + String value, String gas, String gasPrice, String maxFeePerGas, String maxPriorityFee, String input, String gasUsed, long chainId, String contractAddress) + { + if (!TextUtils.isEmpty(contractAddress)) + { + String testContractDeploymentAddress = Utils.calculateContractAddress(from, nonce); + if (testContractDeploymentAddress.equalsIgnoreCase(contractAddress)) + { + to = contractAddress; + isConstructor = true; + input = CONSTRUCTOR; + } + } + + this.to = to; + this.hash = hash; + this.error = isError; + this.blockNumber = blockNumber; + this.timeStamp = timeStamp; + this.nonce = nonce; + this.from = from; + this.value = value; + this.gas = gas; + this.maxFeePerGas = maxFeePerGas; + this.maxPriorityFee = maxPriorityFee; + this.gasPrice = gasPrice; + this.input = input; + this.gasUsed = gasUsed; + this.chainId = chainId; + } + + protected Transaction(Parcel in) + { + hash = in.readString(); + error = in.readString(); + blockNumber = in.readString(); + timeStamp = in.readLong(); + nonce = in.readInt(); + from = in.readString(); + to = in.readString(); + value = in.readString(); + gas = in.readString(); + gasPrice = in.readString(); + input = in.readString(); + gasUsed = in.readString(); + chainId = in.readLong(); + maxFeePerGas = in.readString(); + maxPriorityFee = in.readString(); + } + + public static final Creator CREATOR = new Creator() + { + @Override + public Transaction createFromParcel(Parcel in) + { + return new Transaction(in); + } + + @Override + public Transaction[] newArray(int size) + { + return new Transaction[size]; + } + }; + + @Override + public int describeContents() + { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) + { dest.writeString(hash); dest.writeString(error); dest.writeString(blockNumber); dest.writeLong(timeStamp); - dest.writeInt(nonce); - dest.writeString(from); - dest.writeString(to); - dest.writeString(value); - dest.writeString(gas); - dest.writeString(gasPrice); - dest.writeString(input); - dest.writeString(gasUsed); - dest.writeLong(chainId); - dest.writeString(maxFeePerGas); - dest.writeString(maxPriorityFee); - } - - public boolean isRelated(String contractAddress, String walletAddress) - { - if (contractAddress.equals("eth")) - { - return (input.equals("0x") || from.equalsIgnoreCase(walletAddress)); - } - else if (walletAddress.equalsIgnoreCase(contractAddress)) //transactions sent from or sent to the main currency account - { - return from.equalsIgnoreCase(walletAddress) || to.equalsIgnoreCase(walletAddress); - } - else if (to.equalsIgnoreCase(contractAddress)) - { - return true; - } - else - { - return getWalletInvolvedInTransaction(walletAddress); - } - } - - /** - * Fetch result of transaction operation. - * This is very much a WIP - * @param token - * @return - */ - public String getOperationResult(Token token, int precision) - { - //get amount here. will be amount + symbol if appropriate - if (hasInput()) - { - decodeTransactionInput(token.getWallet()); - String value = transactionInput.getOperationValue(token, this); - boolean isSendOrReceive = !from.equalsIgnoreCase(to) && transactionInput.isSendOrReceive(this); - String prefix = (value.length() == 0 || (value.startsWith("#") || !isSendOrReceive)) ? "" : - (token.getIsSent(this) ? "- " : "+ "); - return prefix + value; - } - else - { - return token.getTransactionValue(this, precision); - } - } - - /** - * Can the contract call be valid if the operation token is Ethereum? - * @param token - * @return - */ - public boolean shouldShowSymbol(Token token) - { - if (hasInput()) - { - decodeTransactionInput(token.getWallet()); - return transactionInput.shouldShowSymbol(token); - } - else - { - return true; - } - } - - public String getOperationTokenAddress() - { - if (hasInput()) - { - return to; - } - else - { - return ""; - } - } - - public boolean isLegacyTransaction() - { - try - { - return !TextUtils.isEmpty(gasPrice) && new BigInteger(gasPrice).compareTo(BigInteger.ZERO) > 0; - } - catch (Exception e) - { - return true; - } - } - - public String getOperationName(Context ctx, Token token, String walletAddress) - { - String txName = null; - if (isPending()) - { - txName = ctx.getString(R.string.status_pending); - } - else if (hasInput()) - { - decodeTransactionInput(walletAddress); - if (token.isEthereum() && shouldShowSymbol(token)) - { - transactionInput.type = TransactionType.CONTRACT_CALL; - } - - return transactionInput.getOperationTitle(ctx); - } - - return txName; - } - - public boolean hasInput() - { - return input != null && input.length() >= 10; - } - - public int getOperationToFrom(String walletAddress) - { - if (hasInput()) - { - decodeTransactionInput(walletAddress); - return transactionInput.getOperationToFrom(); - } - else - { - return 0; - } - } - - public StatusType getOperationImage(Token token) - { - if (hasError()) - { - return StatusType.FAILED; - } - else if (hasInput()) - { - decodeTransactionInput(token.getWallet()); - return transactionInput.getOperationImage(this, token.getWallet()); - } - else - { - return from.equalsIgnoreCase(token.getWallet()) ? StatusType.SENT : StatusType.RECEIVE; - } - } - - public TransactionType getTransactionType(String wallet) - { - if (hasError()) - { - return TransactionType.UNKNOWN; - } - else if (hasInput()) - { - decodeTransactionInput(wallet); - return transactionInput.type; - } - else - { - return TransactionType.SEND_ETH; - } - } - - /** - * Supplimental info in this case is the intrinsic root value attached to a contract call - * EG: Calling cryptokitties ERC721 'breedWithAuto' function requires you to call the function and also attach a small amount of ETH - * for the 'breeding fee'. That fee is later released to the caller of the 'birth' function. - * Supplemental info for these transaction would appear as -0.031 for the 'breedWithAuto' and +0.031 on the 'birth' call - * However it's not that simple - the 'breeding fee' will be in the value attached to the transaction, however the 'midwife' reward appears - * as an internal transaction, so won't be in the 'value' property. - * - * @return - */ - public String getSupplementalInfo(String walletAddress, String networkName) - { - if (hasInput()) - { - decodeTransactionInput(walletAddress); - return transactionInput.getSupplimentalInfo(this, walletAddress, networkName); - } - else - { - return ""; - } - } - - public String getPrefix(Token token) - { - if (hasInput()) - { - decodeTransactionInput(token.getWallet()); - if (!transactionInput.isSendOrReceive(this) || token.isEthereum()) - { - return ""; - } - else if (token.isERC721()) - { - return ""; - } - } - - boolean isSent = token.getIsSent(this); - boolean isSelf = from.equalsIgnoreCase(to); - if (isSelf) return ""; - else if (isSent) return "- "; - else return "+ "; - } + dest.writeInt(nonce); + dest.writeString(from); + dest.writeString(to); + dest.writeString(value); + dest.writeString(gas); + dest.writeString(gasPrice); + dest.writeString(input); + dest.writeString(gasUsed); + dest.writeLong(chainId); + dest.writeString(maxFeePerGas); + dest.writeString(maxPriorityFee); + } + + public boolean isRelated(String contractAddress, String walletAddress) + { + if (contractAddress.equals("eth")) + { + return (input.equals("0x") || from.equalsIgnoreCase(walletAddress)); + } + else if (walletAddress.equalsIgnoreCase(contractAddress)) //transactions sent from or sent to the main currency account + { + return from.equalsIgnoreCase(walletAddress) || to.equalsIgnoreCase(walletAddress); + } + else if (to.equalsIgnoreCase(contractAddress)) + { + return true; + } + else + { + return getWalletInvolvedInTransaction(walletAddress); + } + } + + /** + * Fetch result of transaction operation. + * This is very much a WIP + * + * @param token + * @return + */ + public String getOperationResult(Token token, int precision) + { + //get amount here. will be amount + symbol if appropriate + if (hasInput()) + { + decodeTransactionInput(token.getWallet()); + String value = transactionInput.getOperationValue(token, this); + boolean isSendOrReceive = !from.equalsIgnoreCase(to) && transactionInput.isSendOrReceive(this); + String prefix = (value.length() == 0 || (value.startsWith("#") || !isSendOrReceive)) ? "" : + (token.getIsSent(this) ? "- " : "+ "); + return prefix + value; + } + else + { + return token.getTransactionValue(this, precision); + } + } + + /** + * Can the contract call be valid if the operation token is Ethereum? + * + * @param token + * @return + */ + public boolean shouldShowSymbol(Token token) + { + if (hasInput()) + { + decodeTransactionInput(token.getWallet()); + return transactionInput.shouldShowSymbol(token); + } + else + { + return true; + } + } + + public String getOperationTokenAddress() + { + if (hasInput()) + { + return to; + } + else + { + return ""; + } + } + + public boolean isLegacyTransaction() + { + try + { + return !TextUtils.isEmpty(gasPrice) && new BigInteger(gasPrice).compareTo(BigInteger.ZERO) > 0; + } + catch (Exception e) + { + return true; + } + } + + public String getOperationName(Context ctx, Token token, String walletAddress) + { + String txName = null; + if (isPending()) + { + txName = ctx.getString(R.string.status_pending); + } + else if (hasInput()) + { + decodeTransactionInput(walletAddress); + if (token.isEthereum() && shouldShowSymbol(token)) + { + transactionInput.type = TransactionType.CONTRACT_CALL; + } + + return transactionInput.getOperationTitle(ctx); + } + + return txName; + } + + public boolean hasInput() + { + return input != null && input.length() >= 10; + } + + public int getOperationToFrom(String walletAddress) + { + if (hasInput()) + { + decodeTransactionInput(walletAddress); + return transactionInput.getOperationToFrom(); + } + else + { + return 0; + } + } + + public StatusType getOperationImage(Token token) + { + if (hasError()) + { + return StatusType.FAILED; + } + else if (hasInput()) + { + decodeTransactionInput(token.getWallet()); + return transactionInput.getOperationImage(this, token.getWallet()); + } + else + { + return from.equalsIgnoreCase(token.getWallet()) ? StatusType.SENT : StatusType.RECEIVE; + } + } + + public TransactionType getTransactionType(String wallet) + { + if (hasError()) + { + return TransactionType.UNKNOWN; + } + else if (hasInput()) + { + decodeTransactionInput(wallet); + return transactionInput.type; + } + else + { + return TransactionType.SEND_ETH; + } + } + + /** + * Supplimental info in this case is the intrinsic root value attached to a contract call + * EG: Calling cryptokitties ERC721 'breedWithAuto' function requires you to call the function and also attach a small amount of ETH + * for the 'breeding fee'. That fee is later released to the caller of the 'birth' function. + * Supplemental info for these transaction would appear as -0.031 for the 'breedWithAuto' and +0.031 on the 'birth' call + * However it's not that simple - the 'breeding fee' will be in the value attached to the transaction, however the 'midwife' reward appears + * as an internal transaction, so won't be in the 'value' property. + * + * @return + */ + public String getSupplementalInfo(String walletAddress, String networkName) + { + if (hasInput()) + { + decodeTransactionInput(walletAddress); + return transactionInput.getSupplimentalInfo(this, walletAddress, networkName); + } + else + { + return ""; + } + } + + public String getPrefix(Token token) + { + if (hasInput()) + { + decodeTransactionInput(token.getWallet()); + if (!transactionInput.isSendOrReceive(this) || token.isEthereum()) + { + return ""; + } + else if (token.isERC721()) + { + return ""; + } + } + + boolean isSent = token.getIsSent(this); + boolean isSelf = from.equalsIgnoreCase(to); + if (isSelf) return ""; + else if (isSent) return "- "; + else return "+ "; + } public BigDecimal getRawValue(String walletAddress) throws Exception { - if (hasInput()) - { - decodeTransactionInput(walletAddress); - return transactionInput.getRawValue(); - } - else - { - return new BigDecimal(value); - } - } - - public StatusType getTransactionStatus() - { - if (hasError()) - { - return StatusType.FAILED; - } - else if (blockNumber.equals("-1")) - { - return StatusType.REJECTED; - } - else if (isPending()) - { - return StatusType.PENDING; - } - else - { - return null; - } - } + if (hasInput()) + { + decodeTransactionInput(walletAddress); + return transactionInput.getRawValue(); + } + else + { + return new BigDecimal(value); + } + } + + public StatusType getTransactionStatus() + { + if (hasError()) + { + return StatusType.FAILED; + } + else if (blockNumber.equals("-1")) + { + return StatusType.REJECTED; + } + else if (isPending()) + { + return StatusType.PENDING; + } + else + { + return null; + } + } public void addTransactionElements(Map resultMap) { - resultMap.put("__hash", new EventResult("", hash)); - resultMap.put("__to", new EventResult("", to)); - resultMap.put("__from", new EventResult("", from)); - resultMap.put("__value", new EventResult("", value)); - resultMap.put("__chainId", new EventResult("", String.valueOf(chainId))); - } - - public String getEventName(String walletAddress) - { - String eventName = ""; - if (hasInput()) - { - decodeTransactionInput(walletAddress); - eventName = transactionInput.getOperationEvent(walletAddress); - } - - return eventName; - } - - public int getSupplementalColour(String supplementalTxt) - { - if (!TextUtils.isEmpty(supplementalTxt)) - { - switch (supplementalTxt.charAt(1)) - { - case '-': - return R.color.negative; - case '+': - return R.color.positive; - default: - break; - } - } - - return R.color.text_primary; - } - - public String getDestination(Token token) - { - if (hasInput()) - { - decodeTransactionInput(token.getWallet()); - return transactionInput.getOperationAddress(this, token); - } - else - { - return token.getAddress(); - } - } - - public String getOperationDetail(Context ctx, Token token, TokensService tService) - { - if (hasInput()) - { - decodeTransactionInput(token.getWallet()); - return transactionInput.getOperationDescription (ctx, this, token, tService); - } - else - { - return ctx.getString(R.string.operation_definition, ctx.getString(R.string.to), ENSHandler.matchENSOrFormat(ctx, to)); - } - } - - private void decodeTransactionInput(String walletAddress) - { - if (transactionInput == null && hasInput() && Utils.isAddressValid(walletAddress)) - { - transactionInput = decoder.decodeInput(this, walletAddress); - } - } - - public boolean getWalletInvolvedInTransaction(String walletAddr) - { - decodeTransactionInput(walletAddr); - if ((transactionInput != null && transactionInput.functionData != null) && transactionInput.containsAddress(walletAddr)) return true; - else if (from.equalsIgnoreCase(walletAddr)) return true; - else if (to.equalsIgnoreCase(walletAddr)) return true; - else return input != null && input.length() > 40 && input.contains(Numeric.cleanHexPrefix(walletAddr.toLowerCase())); - } - - public boolean isNFTSent(String walletAddress) - { - if (hasInput()) - { - decodeTransactionInput(walletAddress); - return transactionInput.isSent(); - } - else - { - return true; - } - } - - public boolean getIsSent(String walletAddress) - { - if (hasInput()) - { - decodeTransactionInput(walletAddress); - return transactionInput.isSent(); - } - else - { - return from.equalsIgnoreCase(walletAddress); - } - } - - public boolean isValueChange(String walletAddress) - { - if (hasInput()) - { - decodeTransactionInput(walletAddress); - return transactionInput.isSendOrReceive(this); - } - else - { - return true; - } - } - - private String calculateContractAddress(String account, long nonce){ - byte[] addressAsBytes = Numeric.hexStringToByteArray(account); - byte[] calculatedAddressAsBytes = - Hash.sha3(RlpEncoder.encode( - new RlpList( - RlpString.create(addressAsBytes), - RlpString.create((nonce))))); - - calculatedAddressAsBytes = Arrays.copyOfRange(calculatedAddressAsBytes, - 12, calculatedAddressAsBytes.length); - return Numeric.toHexString(calculatedAddressAsBytes); - } + resultMap.put("__hash", new EventResult("", hash)); + resultMap.put("__to", new EventResult("", to)); + resultMap.put("__from", new EventResult("", from)); + resultMap.put("__value", new EventResult("", value)); + resultMap.put("__chainId", new EventResult("", String.valueOf(chainId))); + } + + public String getEventName(String walletAddress) + { + String eventName = ""; + if (hasInput()) + { + decodeTransactionInput(walletAddress); + eventName = transactionInput.getOperationEvent(walletAddress); + } + + return eventName; + } + + public int getSupplementalColour(String supplementalTxt) + { + if (!TextUtils.isEmpty(supplementalTxt)) + { + switch (supplementalTxt.charAt(1)) + { + case '-': + return R.color.negative; + case '+': + return R.color.positive; + default: + break; + } + } + + return R.color.text_primary; + } + + public String getDestination(Token token) + { + if (token == null) return ""; + if (hasInput()) + { + decodeTransactionInput(token.getWallet()); + return transactionInput.getOperationAddress(this, token); + } + else + { + return token.getAddress(); + } + } + + public String getOperationDetail(Context ctx, Token token, TokensService tService) + { + if (hasInput()) + { + decodeTransactionInput(token.getWallet()); + return transactionInput.getOperationDescription(ctx, this, token, tService); + } + else + { + return ctx.getString(R.string.operation_definition, ctx.getString(R.string.to), ENSHandler.matchENSOrFormat(ctx, to)); + } + } + + private void decodeTransactionInput(String walletAddress) + { + if (transactionInput == null && hasInput() && Utils.isAddressValid(walletAddress)) + { + transactionInput = decoder.decodeInput(this, walletAddress); + } + } + + public boolean getWalletInvolvedInTransaction(String walletAddr) + { + decodeTransactionInput(walletAddr); + if ((transactionInput != null && transactionInput.functionData != null) && transactionInput.containsAddress(walletAddr)) + return true; + else if (from.equalsIgnoreCase(walletAddr)) return true; + else if (to.equalsIgnoreCase(walletAddr)) return true; + else + return input != null && input.length() > 40 && input.contains(Numeric.cleanHexPrefix(walletAddr.toLowerCase())); + } + + public boolean isNFTSent(String walletAddress) + { + if (hasInput()) + { + decodeTransactionInput(walletAddress); + return transactionInput.isSent(); + } + else + { + return true; + } + } + + public boolean getIsSent(String walletAddress) + { + if (hasInput()) + { + decodeTransactionInput(walletAddress); + return transactionInput.isSent(); + } + else + { + return from.equalsIgnoreCase(walletAddress); + } + } + + public boolean isValueChange(String walletAddress) + { + if (hasInput()) + { + decodeTransactionInput(walletAddress); + return transactionInput.isSendOrReceive(this); + } + else + { + return true; + } + } + + private String calculateContractAddress(String account, long nonce) + { + byte[] addressAsBytes = Numeric.hexStringToByteArray(account); + byte[] calculatedAddressAsBytes = + Hash.sha3(RlpEncoder.encode( + new RlpList( + RlpString.create(addressAsBytes), + RlpString.create((nonce))))); + + calculatedAddressAsBytes = Arrays.copyOfRange(calculatedAddressAsBytes, + 12, calculatedAddressAsBytes.length); + return Numeric.toHexString(calculatedAddressAsBytes); + } } diff --git a/app/src/main/java/com/alphawallet/app/entity/lifi/Action.java b/app/src/main/java/com/alphawallet/app/entity/lifi/Action.java new file mode 100644 index 0000000000..110be10c1a --- /dev/null +++ b/app/src/main/java/com/alphawallet/app/entity/lifi/Action.java @@ -0,0 +1,50 @@ +package com.alphawallet.app.entity.lifi; + +import com.google.gson.annotations.Expose; +import com.google.gson.annotations.SerializedName; + +import java.math.BigDecimal; +import java.math.RoundingMode; + +public class Action +{ + @SerializedName("fromChainId") + @Expose + public long fromChainId; + + @SerializedName("toChainId") + @Expose + public long toChainId; + + @SerializedName("fromToken") + @Expose + public Token fromToken; + + @SerializedName("toToken") + @Expose + public Token toToken; + + @SerializedName("fromAmount") + @Expose + public String fromAmount; + + @SerializedName("slippage") + @Expose + public double slippage; + + @SerializedName("fromAddress") + @Expose + public String fromAddress; + + @SerializedName("toAddress") + @Expose + public String toAddress; + + public String getCurrentPrice() + { + return new BigDecimal(fromToken.priceUSD) + .divide(new BigDecimal(toToken.priceUSD), 4, RoundingMode.DOWN) + .stripTrailingZeros() + .toPlainString(); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/alphawallet/app/entity/lifi/Connection.java b/app/src/main/java/com/alphawallet/app/entity/lifi/Connection.java index 9d5166d1b6..01fe4a324c 100644 --- a/app/src/main/java/com/alphawallet/app/entity/lifi/Connection.java +++ b/app/src/main/java/com/alphawallet/app/entity/lifi/Connection.java @@ -4,7 +4,6 @@ import com.google.gson.annotations.SerializedName; import java.util.List; -import java.util.Objects; public class Connection { @@ -18,83 +17,9 @@ public class Connection @SerializedName("fromTokens") @Expose - public List fromTokens; + public List fromTokens; @SerializedName("toTokens") @Expose - public List toTokens; - - public static class LToken - { - @SerializedName("address") - @Expose - public String address; - - @SerializedName("symbol") - @Expose - public String symbol; - - @SerializedName("decimals") - @Expose - public long decimals; - - @SerializedName("chainId") - @Expose - public long chainId; - - @SerializedName("name") - @Expose - public String name; - - @SerializedName("coinKey") - @Expose - public String coinKey; - - @SerializedName("priceUSD") - @Expose - public String priceUSD; - - @SerializedName("logoURI") - @Expose - public String logoURI; - - public String balance; - public double fiatEquivalent; - - @Override - public boolean equals(Object o) - { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - LToken lToken = (LToken) o; - return address.equals(lToken.address) && symbol.equals(lToken.symbol); - } - - @Override - public int hashCode() - { - return Objects.hash(address, symbol); - } - - // Note: In the LIFI API, the native token has either of these two addresses. - public boolean isNativeToken() - { - return address.equalsIgnoreCase("0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee") || - address.equalsIgnoreCase("0x0000000000000000000000000000000000000000"); - } - - public double getFiatValue() - { - try - { - double value = Double.parseDouble(balance); - double priceUSD = Double.parseDouble(this.priceUSD); - return value * priceUSD; - } - catch (NumberFormatException | NullPointerException e) - { - return 0.0; - } - } - } + public List toTokens; } diff --git a/app/src/main/java/com/alphawallet/app/entity/lifi/Estimate.java b/app/src/main/java/com/alphawallet/app/entity/lifi/Estimate.java new file mode 100644 index 0000000000..ab63b81844 --- /dev/null +++ b/app/src/main/java/com/alphawallet/app/entity/lifi/Estimate.java @@ -0,0 +1,100 @@ +package com.alphawallet.app.entity.lifi; + +import com.google.gson.annotations.Expose; +import com.google.gson.annotations.SerializedName; + +import java.util.ArrayList; + +public class Estimate +{ + @SerializedName("fromAmount") + @Expose + public String fromAmount; + + @SerializedName("toAmount") + @Expose + public String toAmount; + + @SerializedName("toAmountMin") + @Expose + public String toAmountMin; + + @SerializedName("approvalAddress") + @Expose + public String approvalAddress; + + @SerializedName("executionDuration") + @Expose + public long executionDuration; + + @SerializedName("feeCosts") + @Expose + public ArrayList feeCosts; + + @SerializedName("gasCosts") + @Expose + public ArrayList gasCosts; + + @SerializedName("data") + @Expose + public Data data; + + @SerializedName("fromAmountUSD") + @Expose + public String fromAmountUSD; + + @SerializedName("toAmountUSD") + @Expose + public String toAmountUSD; + + public static class Data + { + @SerializedName("blockNumber") + @Expose + public long blockNumber; + + @SerializedName("network") + @Expose + public long network; + + @SerializedName("srcToken") + @Expose + public String srcToken; + + @SerializedName("srcDecimals") + @Expose + public long srcDecimals; + + @SerializedName("srcAmount") + @Expose + public String srcAmount; + + @SerializedName("destToken") + @Expose + public String destToken; + + @SerializedName("destDecimals") + @Expose + public long destDecimals; + + @SerializedName("destAmount") + @Expose + public String destAmount; + + @SerializedName("gasCostUSD") + @Expose + public String gasCostUSD; + + @SerializedName("gasCost") + @Expose + public String gasCost; + + @SerializedName("buyAmount") + @Expose + public String buyAmount; + + @SerializedName("sellAmount") + @Expose + public String sellAmount; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/alphawallet/app/entity/lifi/FeeCost.java b/app/src/main/java/com/alphawallet/app/entity/lifi/FeeCost.java new file mode 100644 index 0000000000..bbbd5cd645 --- /dev/null +++ b/app/src/main/java/com/alphawallet/app/entity/lifi/FeeCost.java @@ -0,0 +1,25 @@ +package com.alphawallet.app.entity.lifi; + +import com.google.gson.annotations.Expose; +import com.google.gson.annotations.SerializedName; + +import java.util.ArrayList; + +public class FeeCost +{ + @SerializedName("name") + @Expose + public String name; + + @SerializedName("percentage") + @Expose + public String percentage; + + @SerializedName("token") + @Expose + public Token token; + + @SerializedName("amount") + @Expose + public String amount; +} \ No newline at end of file diff --git a/app/src/main/java/com/alphawallet/app/entity/lifi/GasCost.java b/app/src/main/java/com/alphawallet/app/entity/lifi/GasCost.java new file mode 100644 index 0000000000..d2ccd5b39b --- /dev/null +++ b/app/src/main/java/com/alphawallet/app/entity/lifi/GasCost.java @@ -0,0 +1,19 @@ +package com.alphawallet.app.entity.lifi; + +import com.google.gson.annotations.Expose; +import com.google.gson.annotations.SerializedName; + +public class GasCost +{ + @SerializedName("amount") + @Expose + public String amount; + + @SerializedName("amountUSD") + @Expose + public String amountUSD; + + @SerializedName("token") + @Expose + public Token token; +} \ No newline at end of file diff --git a/app/src/main/java/com/alphawallet/app/entity/lifi/Quote.java b/app/src/main/java/com/alphawallet/app/entity/lifi/Quote.java index 2e0d1cf6d2..fc2d80e4f1 100644 --- a/app/src/main/java/com/alphawallet/app/entity/lifi/Quote.java +++ b/app/src/main/java/com/alphawallet/app/entity/lifi/Quote.java @@ -3,9 +3,6 @@ import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; -import java.math.BigDecimal; -import java.util.ArrayList; - public class Quote { @SerializedName("id") @@ -22,186 +19,16 @@ public class Quote @SerializedName("toolDetails") @Expose - public ToolDetails toolDetails; - - public static class ToolDetails - { - @SerializedName("key") - @Expose - public String key; - - @SerializedName("name") - @Expose - public String name; - - @SerializedName("logoURI") - @Expose - public String logoURI; - } + public SwapProvider swapProvider; @SerializedName("action") @Expose public Action action; - public static class Action - { - @SerializedName("fromChainId") - @Expose - public long fromChainId; - - @SerializedName("toChainId") - @Expose - public long toChainId; - - @SerializedName("fromToken") - @Expose - public Connection.LToken fromToken; - - @SerializedName("toToken") - @Expose - public Connection.LToken toToken; - - @SerializedName("fromAmount") - @Expose - public String fromAmount; - - @SerializedName("slippage") - @Expose - public double slippage; - - @SerializedName("fromAddress") - @Expose - public String fromAddress; - - @SerializedName("toAddress") - @Expose - public String toAddress; - } - @SerializedName("estimate") @Expose public Estimate estimate; - public static class Estimate - { - @SerializedName("fromAmount") - @Expose - public String fromAmount; - - @SerializedName("toAmount") - @Expose - public String toAmount; - - @SerializedName("toAmountMin") - @Expose - public String toAmountMin; - - @SerializedName("approvalAddress") - @Expose - public String approvalAddress; - - @SerializedName("executionDuration") - @Expose - public long executionDuration; - -// @SerializedName("feeCosts") -// @Expose -// public JSONArray feeCosts; - - @SerializedName("gasCosts") - @Expose - public ArrayList gasCosts; - - public static class GasCost - { - @SerializedName("amount") - @Expose - public String amount; - - @SerializedName("amountUSD") - @Expose - public String amountUSD; - - @SerializedName("token") - @Expose - public Token token; - - public static class Token - { - @SerializedName("symbol") - @Expose - public String symbol; - - @SerializedName("decimals") - @Expose - public long decimals; - } - } - - @SerializedName("data") - @Expose - public Data data; - - public static class Data - { - @SerializedName("blockNumber") - @Expose - public long blockNumber; - - @SerializedName("network") - @Expose - public long network; - - @SerializedName("srcToken") - @Expose - public String srcToken; - - @SerializedName("srcDecimals") - @Expose - public long srcDecimals; - - @SerializedName("srcAmount") - @Expose - public String srcAmount; - - @SerializedName("destToken") - @Expose - public String destToken; - - @SerializedName("destDecimals") - @Expose - public long destDecimals; - - @SerializedName("destAmount") - @Expose - public String destAmount; - - @SerializedName("gasCostUSD") - @Expose - public String gasCostUSD; - - @SerializedName("gasCost") - @Expose - public String gasCost; - - @SerializedName("buyAmount") - @Expose - public String buyAmount; - - @SerializedName("sellAmount") - @Expose - public String sellAmount; - } - - @SerializedName("fromAmountUSD") - @Expose - public String fromAmountUSD; - - @SerializedName("toAmountUSD") - @Expose - public String toAmountUSD; - } - @SerializedName("transactionRequest") @Expose public TransactionRequest transactionRequest; @@ -236,10 +63,4 @@ public static class TransactionRequest @Expose public String gasPrice; } - - public String getCurrentPrice() - { - return new BigDecimal(action.fromToken.priceUSD) - .multiply(new BigDecimal(action.toToken.priceUSD)).toString(); - } } diff --git a/app/src/main/java/com/alphawallet/app/entity/lifi/Route.java b/app/src/main/java/com/alphawallet/app/entity/lifi/Route.java new file mode 100644 index 0000000000..97719ea00c --- /dev/null +++ b/app/src/main/java/com/alphawallet/app/entity/lifi/Route.java @@ -0,0 +1,36 @@ +package com.alphawallet.app.entity.lifi; + +import com.google.gson.annotations.Expose; +import com.google.gson.annotations.SerializedName; + +import java.util.List; + +public class Route +{ + @SerializedName("gasCostUSD") + @Expose + public String gasCostUSD; + + @SerializedName("steps") + @Expose + public List steps; + + @SerializedName("tags") + @Expose + public List tags; + + public static class Step + { + @SerializedName("toolDetails") + @Expose + public SwapProvider swapProvider; + + @SerializedName("action") + @Expose + public Action action; + + @SerializedName("estimate") + @Expose + public Estimate estimate; + } +} diff --git a/app/src/main/java/com/alphawallet/app/entity/lifi/RouteError.java b/app/src/main/java/com/alphawallet/app/entity/lifi/RouteError.java new file mode 100644 index 0000000000..aa6135d733 --- /dev/null +++ b/app/src/main/java/com/alphawallet/app/entity/lifi/RouteError.java @@ -0,0 +1,23 @@ +package com.alphawallet.app.entity.lifi; + +import com.google.gson.annotations.Expose; +import com.google.gson.annotations.SerializedName; + +public class RouteError +{ + @SerializedName("tool") + @Expose + public String tool; + + @SerializedName("message") + @Expose + public String message; + + @SerializedName("errorType") + @Expose + public String errorType; + + @SerializedName("code") + @Expose + public String code; +} diff --git a/app/src/main/java/com/alphawallet/app/entity/lifi/RouteOptions.java b/app/src/main/java/com/alphawallet/app/entity/lifi/RouteOptions.java new file mode 100644 index 0000000000..99882f661a --- /dev/null +++ b/app/src/main/java/com/alphawallet/app/entity/lifi/RouteOptions.java @@ -0,0 +1,33 @@ +package com.alphawallet.app.entity.lifi; + +import com.google.gson.Gson; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.util.ArrayList; +import java.util.List; + +public class RouteOptions +{ + public String integrator; + public String slippage; + public Exchanges exchanges; + public String order; + + public RouteOptions() + { + this.exchanges = new Exchanges(); + } + + public static class Exchanges + { + public List allow = new ArrayList<>(); + } + + public JSONObject getJson() throws JSONException + { + String json = new Gson().toJson(this); + return new JSONObject(json); + } +} diff --git a/app/src/main/java/com/alphawallet/app/entity/lifi/SwapProvider.java b/app/src/main/java/com/alphawallet/app/entity/lifi/SwapProvider.java new file mode 100644 index 0000000000..6b01e6a292 --- /dev/null +++ b/app/src/main/java/com/alphawallet/app/entity/lifi/SwapProvider.java @@ -0,0 +1,25 @@ +package com.alphawallet.app.entity.lifi; + +import com.google.gson.annotations.Expose; +import com.google.gson.annotations.SerializedName; + +public class SwapProvider +{ + @SerializedName("key") + @Expose + public String key; + + @SerializedName("name") + @Expose + public String name; + + @SerializedName("logoURI") + @Expose + public String logoURI; + + @SerializedName("url") + @Expose + public String url; + + public boolean isChecked; +} \ No newline at end of file diff --git a/app/src/main/java/com/alphawallet/app/entity/lifi/Token.java b/app/src/main/java/com/alphawallet/app/entity/lifi/Token.java new file mode 100644 index 0000000000..83ec1225a6 --- /dev/null +++ b/app/src/main/java/com/alphawallet/app/entity/lifi/Token.java @@ -0,0 +1,91 @@ +package com.alphawallet.app.entity.lifi; + +import com.google.gson.annotations.Expose; +import com.google.gson.annotations.SerializedName; + +import java.util.Objects; + +public class Token +{ + @SerializedName("address") + @Expose + public String address; + + @SerializedName("symbol") + @Expose + public String symbol; + + @SerializedName("decimals") + @Expose + public long decimals; + + @SerializedName("chainId") + @Expose + public long chainId; + + @SerializedName("name") + @Expose + public String name; + + @SerializedName("coinKey") + @Expose + public String coinKey; + + @SerializedName("priceUSD") + @Expose + public String priceUSD; + + @SerializedName("logoURI") + @Expose + public String logoURI; + + public String balance; + public double fiatEquivalent; + + @Override + public boolean equals(Object o) + { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + Token lToken = (Token) o; + return address.equals(lToken.address) && symbol.equals(lToken.symbol); + } + + @Override + public int hashCode() + { + return Objects.hash(address, symbol); + } + + // Note: In the LIFI API, the native token has either of these two addresses. + public boolean isNativeToken() + { + return address.equalsIgnoreCase("0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee") || + address.equalsIgnoreCase("0x0000000000000000000000000000000000000000"); + } + + public double getFiatValue() + { + try + { + double value = Double.parseDouble(balance); + double priceUSD = Double.parseDouble(this.priceUSD); + return value * priceUSD; + } + catch (NumberFormatException | NullPointerException e) + { + return 0.0; + } + } + + public boolean isSimilarTo(com.alphawallet.app.entity.tokens.Token aToken, String walletAddress) + { + if (this.chainId == aToken.tokenInfo.chainId + && this.address.equalsIgnoreCase(aToken.getAddress())) + { + return true; + } + + return aToken.getAddress().equalsIgnoreCase(walletAddress) && isNativeToken(); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/alphawallet/app/entity/nftassets/NFTAsset.java b/app/src/main/java/com/alphawallet/app/entity/nftassets/NFTAsset.java index 30fa7cb5dd..4f12d851a5 100644 --- a/app/src/main/java/com/alphawallet/app/entity/nftassets/NFTAsset.java +++ b/app/src/main/java/com/alphawallet/app/entity/nftassets/NFTAsset.java @@ -100,6 +100,7 @@ public NFTAsset(BigInteger tokenId) attributeMap.clear(); balance = BigDecimal.ONE; assetMap.put(NAME, "ID #" + tokenId.toString()); + assetMap.put(LOADING_TOKEN, "."); } public NFTAsset(NFTAsset asset) @@ -382,6 +383,11 @@ public boolean needsLoading() return (assetMap.size() == 0 || assetMap.containsKey(LOADING_TOKEN)); } + public boolean hasImageAsset() + { + return !TextUtils.isEmpty(getThumbnail()); + } + public boolean requiresReplacement() { return (needsLoading() || !assetMap.containsKey(NAME) || TextUtils.isEmpty(getImage())); diff --git a/app/src/main/java/com/alphawallet/app/entity/opensea/OpenSeaAsset.java b/app/src/main/java/com/alphawallet/app/entity/opensea/OpenSeaAsset.java index 954e2fdb27..635de75260 100644 --- a/app/src/main/java/com/alphawallet/app/entity/opensea/OpenSeaAsset.java +++ b/app/src/main/java/com/alphawallet/app/entity/opensea/OpenSeaAsset.java @@ -88,6 +88,10 @@ public class OpenSeaAsset @Expose public LastSale lastSale; + @SerializedName("rarity_data") + @Expose + public Rarity rarity; + public static class Collection { @SerializedName("stats") diff --git a/app/src/main/java/com/alphawallet/app/entity/opensea/Rarity.java b/app/src/main/java/com/alphawallet/app/entity/opensea/Rarity.java new file mode 100644 index 0000000000..5160fcaec5 --- /dev/null +++ b/app/src/main/java/com/alphawallet/app/entity/opensea/Rarity.java @@ -0,0 +1,31 @@ +package com.alphawallet.app.entity.opensea; + +import com.google.gson.annotations.Expose; +import com.google.gson.annotations.SerializedName; + +public class Rarity +{ + @SerializedName("strategy_id") + @Expose + public String strategyId; + + @SerializedName("strategy_version") + @Expose + public String strategyVersion; + + @SerializedName("rank") + @Expose + public long rank; + + @SerializedName("score") + @Expose + public double score; + + @SerializedName("max_rank") + @Expose + public long maxRank; + + @SerializedName("tokens_scored") + @Expose + public long tokensScored; +} diff --git a/app/src/main/java/com/alphawallet/app/entity/tokens/ERC1155Token.java b/app/src/main/java/com/alphawallet/app/entity/tokens/ERC1155Token.java index f879983a38..84f8ecc789 100644 --- a/app/src/main/java/com/alphawallet/app/entity/tokens/ERC1155Token.java +++ b/app/src/main/java/com/alphawallet/app/entity/tokens/ERC1155Token.java @@ -276,27 +276,39 @@ public Function getTransferFunction(String to, List tokenIds) throws } @Override - public List getChangeList(Map assetMap) + public Map getAssetChange(Map oldAssetList) { - //detect asset removal - List oldAssetIdList = new ArrayList<>(assetMap.keySet()); - oldAssetIdList.removeAll(assets.keySet()); + //first see if there's no change; if this is the case we can skip + if (assetsUnchanged(oldAssetList)) return assets; - List changeList = new ArrayList<>(oldAssetIdList); + //add all known tokens in + Map sum = new HashMap<>(oldAssetList); + sum.putAll(assets); + Set tokenIds = sum.keySet(); + Function balanceOfBatch = balanceOfBatch(getWallet(), tokenIds); + List balances = callSmartContractFunctionArray(tokenInfo.chainId, balanceOfBatch, getAddress(), getWallet()); + Map updatedAssetMap; - //Now detect differences or new tokens - for (BigInteger tokenId : assets.keySet()) + if (balances != null && balances.size() > 0) { - NFTAsset newAsset = assets.get(tokenId); - NFTAsset oldAsset = assetMap.get(tokenId); - - if (oldAsset == null || newAsset.hashCode() != oldAsset.hashCode()) + updatedAssetMap = new HashMap<>(); + int index = 0; + for (BigInteger tokenId : tokenIds) { - changeList.add(tokenId); + NFTAsset thisAsset = new NFTAsset(sum.get(tokenId)); + BigInteger balance = balances.get(index).getValue(); + thisAsset.setBalance(new BigDecimal(balance)); + updatedAssetMap.put(tokenId, thisAsset); + + index++; } } + else + { + updatedAssetMap = assets; + } - return changeList; + return updatedAssetMap; } private List fetchBalances(Set tokenIds) @@ -308,16 +320,10 @@ private List fetchBalances(Set tokenIds) @Override public Map queryAssets(Map assetMap) { - //first see if there's no change; if this is the case we can skip - if (assetsUnchanged(assetMap)) return assets; - - //add all known tokens in - Map sum = new HashMap<>(assetMap); - sum.putAll(assets); - Set tokenIds = sum.keySet(); + Set tokenIds = assetMap.keySet(); Function balanceOfBatch = balanceOfBatch(getWallet(), tokenIds); List balances = callSmartContractFunctionArray(tokenInfo.chainId, balanceOfBatch, getAddress(), getWallet()); - Map updatedAssetMap; + Map updatedAssetMap = new HashMap<>(); if (balances != null && balances.size() > 0) { @@ -325,7 +331,7 @@ public Map queryAssets(Map assetMap) int index = 0; for (BigInteger tokenId : tokenIds) { - NFTAsset thisAsset = new NFTAsset(sum.get(tokenId)); + NFTAsset thisAsset = new NFTAsset(assetMap.get(tokenId)); BigInteger balance = balances.get(index).getValue(); thisAsset.setBalance(new BigDecimal(balance)); updatedAssetMap.put(tokenId, thisAsset); @@ -333,10 +339,6 @@ public Map queryAssets(Map assetMap) index++; } } - else - { - updatedAssetMap = assets; - } return updatedAssetMap; } @@ -643,7 +645,7 @@ public BigDecimal updateBalance(Realm realm) try { - final Web3j web3j = TokenRepository.getWeb3jService(tokenInfo.chainId); + final Web3j web3j = TokenRepository.getWeb3jServiceForEvents(tokenInfo.chainId); Pair, HashSet>> evRead = eventSync.processTransferEvents(web3j, getBalanceUpdateEvents(), startBlock, endBlock, realm); diff --git a/app/src/main/java/com/alphawallet/app/entity/tokens/ERC721Ticket.java b/app/src/main/java/com/alphawallet/app/entity/tokens/ERC721Ticket.java index 813eeda7fa..49a6e8c5ca 100644 --- a/app/src/main/java/com/alphawallet/app/entity/tokens/ERC721Ticket.java +++ b/app/src/main/java/com/alphawallet/app/entity/tokens/ERC721Ticket.java @@ -171,7 +171,7 @@ public boolean hasArrayBalance() public List getNonZeroArrayBalance() { List nonZeroValues = new ArrayList<>(); - for (BigInteger value : balanceArray) if (value.compareTo(BigInteger.ZERO) != 0 && !nonZeroValues.contains(value)) nonZeroValues.add(value); + for (BigInteger value : balanceArray) if (value.compareTo(BigInteger.ZERO) != 0) nonZeroValues.add(value); return nonZeroValues; } diff --git a/app/src/main/java/com/alphawallet/app/entity/tokens/ERC721Token.java b/app/src/main/java/com/alphawallet/app/entity/tokens/ERC721Token.java index 780840a40a..96dca9e976 100644 --- a/app/src/main/java/com/alphawallet/app/entity/tokens/ERC721Token.java +++ b/app/src/main/java/com/alphawallet/app/entity/tokens/ERC721Token.java @@ -49,6 +49,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -264,7 +265,9 @@ public boolean checkRealmBalanceChange(RealmToken realmToken) public boolean checkBalanceChange(Token oldToken) { if (super.checkBalanceChange(oldToken)) return true; - if (getTokenAssets().size() != oldToken.getTokenAssets().size()) return true; + if ((getTokenAssets() != null && oldToken.getTokenAssets() != null) + && getTokenAssets().size() != oldToken.getTokenAssets().size()) return true; + for (BigInteger tokenId : tokenBalanceAssets.keySet()) { NFTAsset newAsset = tokenBalanceAssets.get(tokenId); @@ -350,7 +353,7 @@ public BigDecimal updateBalance(Realm realm) try { balanceChecks.put(tokenInfo.address, true); //set checking - final Web3j web3j = TokenRepository.getWeb3jService(tokenInfo.chainId); + final Web3j web3j = TokenRepository.getWeb3jServiceForEvents(tokenInfo.chainId); if (contractType == ContractType.ERC721_ENUMERABLE) { updateEnumerableBalance(web3j, realm); @@ -385,6 +388,7 @@ public BigDecimal updateBalance(Realm realm) if (eventSync.handleEthLogError(e.error, startBlock, endBlock, sync, realm)) { //recurse until we find a good value + balanceChecks.remove(tokenInfo.address); updateBalance(realm); } } @@ -598,24 +602,6 @@ public EthFilter getSendBalanceFilter(Event event, DefaultBlockParameter startBl return filter; } - /** - * Returns false if the Asset balance appears to be entries with only TokenId - indicating an ERC721Ticket - * - * @return - */ - @Override - public boolean checkBalanceType() - { - boolean onlyHasTokenId = true; - //if elements contain asset with only assetId then most likely this is a ticket. - for (NFTAsset a : tokenBalanceAssets.values()) - { - if (!a.isBlank()) onlyHasTokenId = false; - } - - return tokenBalanceAssets.size() == 0 || !onlyHasTokenId; - } - public String getTransferID(Transaction tx) { if (tx.transactionInput != null && tx.transactionInput.miscData.size() > 0) @@ -689,18 +675,14 @@ public BigDecimal getBalanceRaw() * If there is a token that previously was there, but now isn't, it could be because * the opensea call was split or that the owner transferred the token * - * @param assetMap Loaded Assets from Realm - * @return map of currently known live assets + * @param assetMap Loaded Assets which are new assets (don't add assets from opensea unless we double check here first) + * @return map of checked assets */ @Override public Map queryAssets(Map assetMap) { final Web3j web3j = TokenRepository.getWeb3jService(tokenInfo.chainId); - //check all tokens in this contract - assetMap.putAll(tokenBalanceAssets); - - //now check balance for all tokenIds (note that ERC1155 has a batch balance check, ERC721 does not) for (Map.Entry entry : assetMap.entrySet()) { BigInteger checkId = entry.getKey(); @@ -721,35 +703,74 @@ else if (owner.equalsIgnoreCase(getWallet())) checkAsset.setBalance(BigDecimal.ZERO); } - //add back into asset map - tokenBalanceAssets.put(checkId, checkAsset); + assetMap.put(checkId, checkAsset); } - return tokenBalanceAssets; + return assetMap; } + // Check for new/missing tokenBalanceAssets @Override - public List getChangeList(Map assetMap) + public Map getAssetChange(Map oldAssetList) { - //detect asset removal - List oldAssetIdList = new ArrayList<>(assetMap.keySet()); - oldAssetIdList.removeAll(tokenBalanceAssets.keySet()); + Map updatedAssets = new HashMap<>(); + // detect asset removal, first find new assets + HashSet changedAssetList = new HashSet<>(tokenBalanceAssets.keySet()); + changedAssetList.removeAll(oldAssetList.keySet()); - List changeList = new ArrayList<>(oldAssetIdList); + HashSet unchangedAssets = new HashSet<>(tokenBalanceAssets.keySet()); + unchangedAssets.removeAll(changedAssetList); + + // removed assets + HashSet removedAssets = new HashSet<>(oldAssetList.keySet()); + removedAssets.removeAll(tokenBalanceAssets.keySet()); + changedAssetList.addAll(removedAssets); + HashSet balanceAssets = new HashSet<>(); + + final Web3j web3j = TokenRepository.getWeb3jService(tokenInfo.chainId); + + try + { + balanceAssets = checkBalances(web3j, changedAssetList); + } + catch (Exception e) + { + // + } //Now detect differences or new tokens - for (BigInteger tokenId : tokenBalanceAssets.keySet()) + for (BigInteger tokenId : changedAssetList) { - NFTAsset newAsset = tokenBalanceAssets.get(tokenId); - NFTAsset oldAsset = assetMap.get(tokenId); + NFTAsset asset = tokenBalanceAssets.get(tokenId); + if (asset == null) asset = oldAssetList.get(tokenId); + + if (asset == null) + { + continue; + } + + if (balanceAssets.contains(tokenId)) + { + asset.setBalance(BigDecimal.ZERO); + } + else + { + asset.setBalance(BigDecimal.ONE); + } - if (oldAsset == null || newAsset.hashCode() != oldAsset.hashCode()) + updatedAssets.put(tokenId, asset); + } + + for (BigInteger tokenId : unchangedAssets) + { + NFTAsset asset = tokenBalanceAssets.get(tokenId); + if (asset != null) { - changeList.add(tokenId); + updatedAssets.put(tokenId, asset); } } - return changeList; + return updatedAssets; } private String callSmartContractFunction(Web3j web3j, diff --git a/app/src/main/java/com/alphawallet/app/entity/tokens/Ticket.java b/app/src/main/java/com/alphawallet/app/entity/tokens/Ticket.java index e909b34178..44e5b85115 100644 --- a/app/src/main/java/com/alphawallet/app/entity/tokens/Ticket.java +++ b/app/src/main/java/com/alphawallet/app/entity/tokens/Ticket.java @@ -10,7 +10,6 @@ import com.alphawallet.app.entity.tokendata.TokenGroup; import com.alphawallet.app.repository.EventResult; import com.alphawallet.app.repository.entity.RealmToken; -import com.alphawallet.app.service.AssetDefinitionService; import com.alphawallet.app.util.Utils; import com.alphawallet.app.viewmodel.BaseViewModel; import com.alphawallet.token.entity.TicketRange; @@ -27,31 +26,34 @@ import java.util.List; /** - * Created by James on 27/01/2018. It might seem counter intuitive - * but here Ticket refers to a container of an asset class here, not - * the right to seat somewhere in the venue. Therefore, there - * shouldn't be List To understand this, imagine that one says - * "I have two cryptocurrencies: Ether and Bitcoin, each amounts to a - * hundred", and he pauses and said, "I also have two indices: FIFA - * and Formuler-one, which, too, amounts to a hundred each". + * Created by James on 27/01/2018. */ public class Ticket extends Token { private final List balanceArray; - private boolean isMatchedInXML = false; - public Ticket(TokenInfo tokenInfo, List balances, long blancaTime, String networkName, ContractType type) { + public Ticket(TokenInfo tokenInfo, List balances, long blancaTime, String networkName, ContractType type) + { super(tokenInfo, BigDecimal.ZERO, blancaTime, networkName, type); this.balanceArray = balances; - balance = balanceArray != null ? BigDecimal.valueOf(balanceArray.size()) : BigDecimal.ZERO; + balance = balanceArray != null ? BigDecimal.valueOf(getNonZeroArrayBalance().size()) : BigDecimal.ZERO; group = TokenGroup.NFT; } - public Ticket(TokenInfo tokenInfo, String balances, long blancaTime, String networkName, ContractType type) { + public Ticket(TokenInfo tokenInfo, String balances, long blancaTime, String networkName, ContractType type) + { super(tokenInfo, BigDecimal.ZERO, blancaTime, networkName, type); this.balanceArray = stringHexToBigIntegerList(balances); - balance = BigDecimal.valueOf(balanceArray.size()); + balance = BigDecimal.valueOf(getNonZeroArrayBalance().size()); + group = TokenGroup.NFT; + } + + public Ticket(Token oldTicket, List balances) + { + super(oldTicket.tokenInfo, BigDecimal.ZERO, oldTicket.updateBlancaTime, oldTicket.getNetworkName(), oldTicket.contractType); + this.balanceArray = balances; + balance = BigDecimal.valueOf(getNonZeroArrayBalance().size()); group = TokenGroup.NFT; } @@ -235,11 +237,6 @@ private List tokenIdsToTokenIndices(List tokenIds) return indexList; } - public void checkIsMatchedInXML(AssetDefinitionService assetService) - { - isMatchedInXML = assetService.hasDefinition(tokenInfo.chainId, tokenInfo.address); - } - @Override public Function getTransferFunction(String to, List tokenIndices) throws NumberFormatException { @@ -305,7 +302,10 @@ public boolean hasArrayBalance() public List getNonZeroArrayBalance() { List nonZeroValues = new ArrayList<>(); - for (BigInteger value : balanceArray) if (value.compareTo(BigInteger.ZERO) != 0 && !nonZeroValues.contains(value)) nonZeroValues.add(value); + for (BigInteger value : balanceArray) + { + if (value.compareTo(BigInteger.ZERO) != 0) nonZeroValues.add(value); + } return nonZeroValues; } diff --git a/app/src/main/java/com/alphawallet/app/entity/tokens/Token.java b/app/src/main/java/com/alphawallet/app/entity/tokens/Token.java index f0164cde88..0108c12332 100644 --- a/app/src/main/java/com/alphawallet/app/entity/tokens/Token.java +++ b/app/src/main/java/com/alphawallet/app/entity/tokens/Token.java @@ -383,7 +383,7 @@ public void setIsEthereum() public boolean isBad() { - return tokenInfo == null || (tokenInfo.symbol == null && tokenInfo.name == null); + return tokenInfo == null || tokenInfo.chainId == 0 || (tokenInfo.symbol == null && tokenInfo.name == null); } public void setTokenWallet(String address) @@ -711,11 +711,6 @@ public int hashCode() return hash; } - public boolean checkBalanceType() - { - return true; - } - public String getTransactionDetail(Context ctx, Transaction tx, TokensService tService) { if (isEthereum()) @@ -922,11 +917,6 @@ public boolean mayRequireRefresh() || (!TextUtils.isEmpty(tokenInfo.symbol) && tokenInfo.symbol.contains("?")); } - public List getChangeList(Map assetMap) - { - return new ArrayList<>(); - } - public void setAssetContract(AssetContract contract) { } public AssetContract getAssetContract() { return null; } @@ -945,6 +935,11 @@ public Map queryAssets(Map assetMap) return assetMap; } + public Map getAssetChange(Map oldAssetList) + { + return oldAssetList; + } + /** * Token Metadata handling */ @@ -1019,4 +1014,4 @@ public HashSet processLogsAndStoreTransferEvents(EthLog receiveLogs, { return null; } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/alphawallet/app/entity/tokens/TokenFactory.java b/app/src/main/java/com/alphawallet/app/entity/tokens/TokenFactory.java index ad437a4f6a..c5b8843e8f 100644 --- a/app/src/main/java/com/alphawallet/app/entity/tokens/TokenFactory.java +++ b/app/src/main/java/com/alphawallet/app/entity/tokens/TokenFactory.java @@ -124,6 +124,7 @@ public Token createToken(TokenInfo tokenInfo, RealmToken realmItem, long updateB case ERC721: case ERC721_LEGACY: case ERC721_ENUMERABLE: + case ERC721_UNDETERMINED: thisToken = new ERC721Token(tokenInfo, null, decimalBalance, updateBlancaTime, networkName, type); break; diff --git a/app/src/main/java/com/alphawallet/app/entity/tokenscript/TestScript.java b/app/src/main/java/com/alphawallet/app/entity/tokenscript/TestScript.java new file mode 100644 index 0000000000..ab104d6afc --- /dev/null +++ b/app/src/main/java/com/alphawallet/app/entity/tokenscript/TestScript.java @@ -0,0 +1,70 @@ +package com.alphawallet.app.entity.tokenscript; + +/** + * Created by JB on 6/11/2022. + */ +public abstract class TestScript +{ + public static String testScriptXXLF = " STL Office Token" + + " STL Office Tokens Boleto de admisión" + + " Boleto de admisiónes 入場券" + + " 入場券 " + + " 0xC3eeCa3Feb9Dbc06c6e749702AcB8d56A07BFb05 " + + " Unlock 开锁" + + " Abrir " + + " " + + " Lock 关锁" + + " Cerrar " + + " Mint Ape 1 " + + " " + + " Mint Ape 2 " + + " " + + " Mint STL Token" + + " " + + " " + + " "; +} diff --git a/app/src/main/java/com/alphawallet/app/entity/tokenscript/TokenScriptFile.java b/app/src/main/java/com/alphawallet/app/entity/tokenscript/TokenScriptFile.java index 0dac3b5df9..a7a9689839 100644 --- a/app/src/main/java/com/alphawallet/app/entity/tokenscript/TokenScriptFile.java +++ b/app/src/main/java/com/alphawallet/app/entity/tokenscript/TokenScriptFile.java @@ -125,6 +125,10 @@ public String calcMD5() String rand = String.valueOf(new Random(System.currentTimeMillis()).nextInt()); sb.append(rand); //never matches } + catch (Exception e) + { + Timber.w(e); + } //return complete hash return sb.toString(); diff --git a/app/src/main/java/com/alphawallet/app/entity/walletconnect/WalletConnectSessionItem.java b/app/src/main/java/com/alphawallet/app/entity/walletconnect/WalletConnectSessionItem.java index b5df80e809..a3c65ee7a6 100644 --- a/app/src/main/java/com/alphawallet/app/entity/walletconnect/WalletConnectSessionItem.java +++ b/app/src/main/java/com/alphawallet/app/entity/walletconnect/WalletConnectSessionItem.java @@ -7,20 +7,23 @@ */ public class WalletConnectSessionItem { - public final String name; - public final String url; - public final String icon; + public String name = ""; + public String url = ""; + public String icon = ""; public final String sessionId; public final String localSessionId; public final long chainId; public WalletConnectSessionItem(RealmWCSession s) { - name = s.getRemotePeerData().getName(); - url = s.getRemotePeerData().getUrl(); - icon = s.getRemotePeerData().getIcons().size() > 0 ? s.getRemotePeerData().getIcons().get(0) : null; + if (s.getRemotePeerData() != null) + { + name = s.getRemotePeerData().getName(); + url = s.getRemotePeerData().getUrl(); + icon = s.getRemotePeerData().getIcons().size() > 0 ? s.getRemotePeerData().getIcons().get(0) : null; + } sessionId = s.getSession().getTopic(); localSessionId = s.getSessionId(); chainId = s.getChainId() == 0 ? 1 : s.getChainId(); //older sessions without chainId set must be mainnet } -} \ No newline at end of file +} 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 6219475e05..b08da75f99 100644 --- a/app/src/main/java/com/alphawallet/app/repository/EthereumNetworkBase.java +++ b/app/src/main/java/com/alphawallet/app/repository/EthereumNetworkBase.java @@ -3,12 +3,19 @@ /* Please don't add import android at this point. Later this file will be shared * between projects including non-Android projects */ +import static com.alphawallet.app.entity.EventSync.BLOCK_SEARCH_INTERVAL; +import static com.alphawallet.app.entity.EventSync.POLYGON_BLOCK_SEARCH_INTERVAL; +import static com.alphawallet.app.util.Utils.isValidUrl; +import static com.alphawallet.ethereum.EthereumNetworkBase.ARBITRUM_GOERLI_TESTNET_FALLBACK_RPC_URL; +import static com.alphawallet.ethereum.EthereumNetworkBase.ARBITRUM_GOERLI_TEST_ID; import static com.alphawallet.ethereum.EthereumNetworkBase.ARBITRUM_MAIN_ID; import static com.alphawallet.ethereum.EthereumNetworkBase.ARBITRUM_TEST_ID; import static com.alphawallet.ethereum.EthereumNetworkBase.ARTIS_SIGMA1_ID; import static com.alphawallet.ethereum.EthereumNetworkBase.ARTIS_TAU1_ID; import static com.alphawallet.ethereum.EthereumNetworkBase.AURORA_MAINNET_ID; +import static com.alphawallet.ethereum.EthereumNetworkBase.AURORA_MAINNET_RPC_URL; import static com.alphawallet.ethereum.EthereumNetworkBase.AURORA_TESTNET_ID; +import static com.alphawallet.ethereum.EthereumNetworkBase.AURORA_TESTNET_RPC_URL; import static com.alphawallet.ethereum.EthereumNetworkBase.AVALANCHE_ID; import static com.alphawallet.ethereum.EthereumNetworkBase.AVALANCHE_RPC_URL; import static com.alphawallet.ethereum.EthereumNetworkBase.BINANCE_MAIN_ID; @@ -22,35 +29,43 @@ import static com.alphawallet.ethereum.EthereumNetworkBase.FANTOM_TEST_RPC_URL; import static com.alphawallet.ethereum.EthereumNetworkBase.FUJI_TEST_ID; import static com.alphawallet.ethereum.EthereumNetworkBase.FUJI_TEST_RPC_URL; +import static com.alphawallet.ethereum.EthereumNetworkBase.GNOSIS_ID; import static com.alphawallet.ethereum.EthereumNetworkBase.GOERLI_ID; import static com.alphawallet.ethereum.EthereumNetworkBase.HECO_ID; +import static com.alphawallet.ethereum.EthereumNetworkBase.HECO_RPC_URL; import static com.alphawallet.ethereum.EthereumNetworkBase.HECO_TEST_ID; +import static com.alphawallet.ethereum.EthereumNetworkBase.HECO_TEST_RPC_URL; import static com.alphawallet.ethereum.EthereumNetworkBase.IOTEX_MAINNET_ID; +import static com.alphawallet.ethereum.EthereumNetworkBase.IOTEX_MAINNET_RPC_URL; import static com.alphawallet.ethereum.EthereumNetworkBase.IOTEX_TESTNET_ID; +import static com.alphawallet.ethereum.EthereumNetworkBase.IOTEX_TESTNET_RPC_URL; import static com.alphawallet.ethereum.EthereumNetworkBase.KLAYTN_BAOBAB_ID; import static com.alphawallet.ethereum.EthereumNetworkBase.KLAYTN_BAOBAB_RPC; import static com.alphawallet.ethereum.EthereumNetworkBase.KLAYTN_ID; import static com.alphawallet.ethereum.EthereumNetworkBase.KLAYTN_RPC; import static com.alphawallet.ethereum.EthereumNetworkBase.KOVAN_ID; import static com.alphawallet.ethereum.EthereumNetworkBase.MAINNET_ID; -import static com.alphawallet.ethereum.EthereumNetworkBase.PHI_MAIN_ID; -import static com.alphawallet.ethereum.EthereumNetworkBase.PHI_NETWORK_V2_RPC; -import static com.alphawallet.ethereum.EthereumNetworkBase.PHI_V2_MAIN_ID; -import static com.alphawallet.ethereum.EthereumNetworkBase.POLYGON_ID; -import static com.alphawallet.ethereum.EthereumNetworkBase.POLYGON_TEST_ID; import static com.alphawallet.ethereum.EthereumNetworkBase.MILKOMEDA_C1_ID; import static com.alphawallet.ethereum.EthereumNetworkBase.MILKOMEDA_C1_RPC; import static com.alphawallet.ethereum.EthereumNetworkBase.MILKOMEDA_C1_TEST_ID; import static com.alphawallet.ethereum.EthereumNetworkBase.MILKOMEDA_C1_TEST_RPC; +import static com.alphawallet.ethereum.EthereumNetworkBase.OPTIMISM_GOERLI_TESTNET_FALLBACK_RPC_URL; +import static com.alphawallet.ethereum.EthereumNetworkBase.OPTIMISM_GOERLI_TEST_ID; +import static com.alphawallet.ethereum.EthereumNetworkBase.OPTIMISTIC_MAIN_FALLBACK_URL; import static com.alphawallet.ethereum.EthereumNetworkBase.OPTIMISTIC_MAIN_ID; +import static com.alphawallet.ethereum.EthereumNetworkBase.OPTIMISTIC_TEST_FALLBACK_URL; import static com.alphawallet.ethereum.EthereumNetworkBase.OPTIMISTIC_TEST_ID; import static com.alphawallet.ethereum.EthereumNetworkBase.PALM_ID; import static com.alphawallet.ethereum.EthereumNetworkBase.PALM_TEST_ID; import static com.alphawallet.ethereum.EthereumNetworkBase.POA_ID; +import static com.alphawallet.ethereum.EthereumNetworkBase.POLYGON_ID; +import static com.alphawallet.ethereum.EthereumNetworkBase.POLYGON_TEST_ID; import static com.alphawallet.ethereum.EthereumNetworkBase.RINKEBY_ID; import static com.alphawallet.ethereum.EthereumNetworkBase.ROPSTEN_ID; +import static com.alphawallet.ethereum.EthereumNetworkBase.SEPOLIA_TESTNET_ID; +import static com.alphawallet.ethereum.EthereumNetworkBase.SEPOLIA_TESTNET_RPC_URL; import static com.alphawallet.ethereum.EthereumNetworkBase.SOKOL_ID; -import static com.alphawallet.ethereum.EthereumNetworkBase.GNOSIS_ID; +import static com.alphawallet.ethereum.EthereumNetworkBase.XDAI_RPC_URL; import android.text.TextUtils; import android.util.LongSparseArray; @@ -106,24 +121,16 @@ public abstract class EthereumNetworkBase implements EthereumNetworkRepositoryTy public static final String FREE_MAINNET_RPC_URL = "https://rpc.ankr.com/eth"; public static final String FREE_POLYGON_RPC_URL = "https://polygon-rpc.com"; public static final String FREE_ARBITRUM_RPC_URL = "https://arbitrum.public-rpc.com"; - public static final String FREE_RINKEBY_RPC_URL = "https://rpc.ankr.com/eth_rinkeby"; public static final String FREE_GOERLI_RPC_URL = "https://rpc.ankr.com/eth_goerli"; public static final String FREE_MUMBAI_RPC_URL = "https://rpc-mumbai.maticvigil.com"; - public static final String FREE_OPTIMISM_RPC_URL = "https://mainnet.optimism.io"; public static final String FREE_ARBITRUM_TEST_RPC_URL = "https://rinkeby.arbitrum.io/rpc"; - public static final String FREE_KOVAN_RPC_URL = "https://kovan.poa.network"; - public static final String FREE_OPTIMISM_TESTRPC_URL = "https://kovan.optimism.io"; public static final String FREE_PALM_RPC_URL = "https://palm-mainnet.infura.io/v3/3a961d6501e54add9a41aa53f15de99b"; public static final String FREE_PALM_TEST_RPC_URL = "https://palm-testnet.infura.io/v3/3a961d6501e54add9a41aa53f15de99b"; public static final String FREE_CRONOS_MAIN_BETA_RPC_URL = "https://evm.cronos.org"; public static final String MAINNET_RPC_URL = usesProductionKey ? "https://mainnet.infura.io/v3/" + keyProvider.getInfuraKey() : FREE_MAINNET_RPC_URL; - public static final String RINKEBY_RPC_URL = usesProductionKey ? "https://rinkeby.infura.io/v3/" + keyProvider.getInfuraKey() - : FREE_RINKEBY_RPC_URL; - public static final String KOVAN_RPC_URL = usesProductionKey ? "https://kovan.infura.io/v3/" + keyProvider.getInfuraKey() - : FREE_KOVAN_RPC_URL; - public static final String GOERLI_RPC_URL = usesProductionKey ? "https://goerli.infura.io/v3/" + keyProvider.getInfuraKey() + public static final String GOERLI_RPC_URL = usesProductionKey ? "https://goerli.infura.io/v3/" + keyProvider.getInfuraKey() : FREE_GOERLI_RPC_URL; public static final String POLYGON_RPC_URL = usesProductionKey ? "https://polygon-mainnet.infura.io/v3/" + keyProvider.getInfuraKey() : FREE_POLYGON_RPC_URL; @@ -132,11 +139,7 @@ public abstract class EthereumNetworkBase implements EthereumNetworkRepositoryTy public static final String MUMBAI_TEST_RPC_URL = usesProductionKey ? "https://polygon-mumbai.infura.io/v3/" + keyProvider.getInfuraKey() : FREE_MUMBAI_RPC_URL; public static final String OPTIMISTIC_MAIN_URL = usesProductionKey ? "https://optimism-mainnet.infura.io/v3/" + keyProvider.getInfuraKey() - : FREE_OPTIMISM_RPC_URL; - public static final String OPTIMISTIC_TEST_URL = usesProductionKey ? "https://optimism-kovan.infura.io/v3/" + keyProvider.getInfuraKey() - : FREE_OPTIMISM_TESTRPC_URL; - public static final String ARBITRUM_TESTNET_RPC = usesProductionKey ? "https://arbitrum-rinkeby.infura.io/v3/" + keyProvider.getInfuraKey() - : FREE_ARBITRUM_TEST_RPC_URL; + : OPTIMISTIC_MAIN_FALLBACK_URL; public static final String PALM_RPC_URL = usesProductionKey ? "https://palm-mainnet.infura.io/v3/" + keyProvider.getInfuraKey() : FREE_PALM_RPC_URL; public static final String PALM_TEST_RPC_URL = usesProductionKey ? "https://palm-testnet.infura.io/v3/" + keyProvider.getInfuraKey() @@ -149,44 +152,41 @@ public abstract class EthereumNetworkBase implements EthereumNetworkRepositoryTy // Use the "Free" routes as backup in order to diversify node usage; to avoid single point of failure public static final String MAINNET_FALLBACK_RPC_URL = usesProductionKey ? FREE_MAINNET_RPC_URL : "https://mainnet.infura.io/v3/" + keyProvider.getSecondaryInfuraKey(); - public static final String RINKEBY_FALLBACK_RPC_URL = usesProductionKey ? FREE_RINKEBY_RPC_URL : "https://rinkeby.infura.io/v3/" + keyProvider.getSecondaryInfuraKey(); - public static final String KOVAN_FALLBACK_RPC_URL = usesProductionKey ? FREE_KOVAN_RPC_URL : "https://kovan.infura.io/v3/" + keyProvider.getSecondaryInfuraKey(); public static final String GOERLI_FALLBACK_RPC_URL = usesProductionKey ? FREE_GOERLI_RPC_URL : "https://goerli.infura.io/v3/" + keyProvider.getSecondaryInfuraKey(); public static final String ARBITRUM_FALLBACK_MAINNET_RPC = usesProductionKey ? FREE_ARBITRUM_RPC_URL : "https://arbitrum-mainnet.infura.io/v3/" + keyProvider.getSecondaryInfuraKey(); public static final String PALM_RPC_FALLBACK_URL = usesProductionKey ? FREE_PALM_RPC_URL : "https://palm-mainnet.infura.io/v3/" + keyProvider.getSecondaryInfuraKey(); public static final String PALM_TEST_RPC_FALLBACK_URL = usesProductionKey ? FREE_PALM_RPC_URL : "https://palm-testnet.infura.io/v3/" + keyProvider.getSecondaryInfuraKey(); + //Deprecated: for now these RPCs still work + public static final String ROPSTEN_RPC_URL = "https://rpc.ankr.com/eth_ropsten"; + public static final String RINKEBY_RPC_URL = "https://rpc.ankr.com/eth_rinkeby"; + public static final String ARBITRUM_TESTNET_RPC = FREE_ARBITRUM_TEST_RPC_URL; + public static final String SOKOL_RPC_URL = "https://sokol.poa.network"; + + //These Networks are no longer running + public static final String KOVAN_RPC_URL = "https://kovan.poa.network"; + public static final String OPTIMISTIC_TEST_URL = OPTIMISTIC_TEST_FALLBACK_URL; + //Note that AlphaWallet now uses a double node configuration. See class AWHttpService comment 'try primary node'. //If you supply a main RPC and secondary it will try the secondary if the primary node times out after 10 seconds. //See the declaration of NetworkInfo - it has a member backupNodeUrl. Put your secondary node here. - public static final String ROPSTEN_FALLBACK_RPC_URL = "https://ropsten.infura.io/v3/" + keyProvider.getSecondaryInfuraKey(); public static final String CLASSIC_RPC_URL = "https://www.ethercluster.com/etc"; - public static final String XDAI_RPC_URL = com.alphawallet.ethereum.EthereumNetworkBase.XDAI_RPC_URL; public static final String POA_RPC_URL = "https://core.poa.network/"; - public static final String ROPSTEN_RPC_URL = "https://ropsten.infura.io/v3/" + keyProvider.getInfuraKey(); - public static final String SOKOL_RPC_URL = "https://sokol.poa.network"; public static final String ARTIS_SIGMA1_RPC_URL = "https://rpc.sigma1.artis.network"; public static final String ARTIS_TAU1_RPC_URL = "https://rpc.tau1.artis.network"; public static final String BINANCE_TEST_RPC_URL = "https://data-seed-prebsc-1-s3.binance.org:8545"; public static final String BINANCE_TEST_FALLBACK_RPC_URL = "https://data-seed-prebsc-2-s1.binance.org:8545"; public static final String BINANCE_MAIN_RPC_URL = "https://bsc-dataseed.binance.org"; public static final String BINANCE_MAIN_FALLBACK_RPC_URL = "https://bsc-dataseed2.ninicoin.io:443"; - public static final String HECO_RPC_URL = "https://http-mainnet.hecochain.com"; - public static final String HECO_TEST_RPC_URL = "https://http-testnet.hecochain.com"; public static final String POLYGON_FALLBACK_RPC_URL = "https://matic-mainnet.chainstacklabs.com"; public static final String MUMBAI_FALLBACK_RPC_URL = "https://matic-mumbai.chainstacklabs.com"; - public static final String OPTIMISTIC_MAIN_FALLBACK_URL = "https://mainnet.optimism.io"; - public static final String OPTIMISTIC_TEST_FALLBACK_URL = "https://kovan.optimism.io"; public static final String CRONOS_TEST_URL = "https://evm-t3.cronos.org"; public static final String ARBITRUM_FALLBACK_TESTNET_RPC = "https://rinkeby.arbitrum.io/rpc"; - public static final String IOTEX_MAINNET_RPC_URL = "https://babel-api.mainnet.iotex.io"; public static final String IOTEX_MAINNET_RPC_FALLBACK_URL = "https://rpc.ankr.com/iotex"; - public static final String IOTEX_TESTNET_RPC_URL = "https://babel-api.testnet.iotex.io"; - public static final String AURORA_MAINNET_RPC_URL = "https://mainnet.aurora.dev"; - public static final String AURORA_TESTNET_RPC_URL = "https://testnet.aurora.dev"; - public static final String PHI_NETWORK_RPC = "https://rpc1.phi.network"; + public static final String OPTIMISM_GOERLI_TESTNET_RPC_URL = "https://optimism-goerli.infura.io/v3/" + keyProvider.getInfuraKey(); + public static final String ARBITRUM_GOERLI_TESTNET_RPC_URL = "https://arbitrum-goerli.infura.io/v3/" + keyProvider.getInfuraKey(); //All chains that have fiat/real value (not testnet) must be put here //Note: This list also determines the order of display for main net chains in the wallet. @@ -194,11 +194,53 @@ public abstract class EthereumNetworkBase implements EthereumNetworkRepositoryTy //Then xDai would appear as the first token at the top of the wallet private static final List hasValue = new ArrayList<>(Arrays.asList( MAINNET_ID, GNOSIS_ID, POLYGON_ID, CLASSIC_ID, POA_ID, ARTIS_SIGMA1_ID, BINANCE_MAIN_ID, HECO_ID, AVALANCHE_ID, - FANTOM_ID, OPTIMISTIC_MAIN_ID, CRONOS_MAIN_ID, ARBITRUM_MAIN_ID, PALM_ID, KLAYTN_ID, IOTEX_MAINNET_ID, AURORA_MAINNET_ID, MILKOMEDA_C1_ID, PHI_V2_MAIN_ID, - PHI_MAIN_ID)); + FANTOM_ID, OPTIMISTIC_MAIN_ID, CRONOS_MAIN_ID, ARBITRUM_MAIN_ID, PALM_ID, KLAYTN_ID, IOTEX_MAINNET_ID, AURORA_MAINNET_ID, MILKOMEDA_C1_ID)); + + private static final List testnetList = new ArrayList<>(Arrays.asList( + GOERLI_ID, BINANCE_TEST_ID, HECO_TEST_ID, CRONOS_TEST_ID, OPTIMISM_GOERLI_TEST_ID, ARBITRUM_GOERLI_TEST_ID, KLAYTN_BAOBAB_ID, + FANTOM_TEST_ID, IOTEX_TESTNET_ID, FUJI_TEST_ID, POLYGON_TEST_ID, MILKOMEDA_C1_TEST_ID, ARTIS_TAU1_ID, + SEPOLIA_TESTNET_ID, AURORA_TESTNET_ID, PALM_TEST_ID, + //Deprecated networks + ROPSTEN_ID, RINKEBY_ID, KOVAN_ID, OPTIMISTIC_TEST_ID, SOKOL_ID, ARBITRUM_TEST_ID)); + + private static final List deprecatedNetworkList = new ArrayList<>(Arrays.asList( + ROPSTEN_ID, RINKEBY_ID, KOVAN_ID, OPTIMISTIC_TEST_ID, SOKOL_ID, ARBITRUM_TEST_ID)); + + private static final String INFURA_ENDPOINT = ".infura.io/v3/"; + + @Override + public String getDappBrowserRPC(long chainId) + { + NetworkInfo info = getNetworkByChain(chainId); + + if (info == null) + { + return ""; + } + + int index = info.rpcServerUrl.indexOf(INFURA_ENDPOINT); + if (index > 0) + { + return info.rpcServerUrl.substring(0, index + INFURA_ENDPOINT.length()) + keyProvider.getTertiaryInfuraKey(); + } + else if (info.backupNodeUrl != null) + { + return info.backupNodeUrl; + } + else + { + return info.rpcServerUrl; + } + } + + public static boolean isInfura(String rpcServerUrl) + { + return rpcServerUrl.contains(INFURA_ENDPOINT); + } // for reset built-in network - private static final LongSparseArray builtinNetworkMap = new LongSparseArray() { + private static final LongSparseArray builtinNetworkMap = new LongSparseArray() + { { put(MAINNET_ID, new NetworkInfo(C.ETHEREUM_NETWORK_NAME, C.ETH_SYMBOL, MAINNET_RPC_URL, @@ -211,7 +253,7 @@ public abstract class EthereumNetworkBase implements EthereumNetworkRepositoryTy put(GNOSIS_ID, new NetworkInfo(C.XDAI_NETWORK_NAME, C.xDAI_SYMBOL, XDAI_RPC_URL, "https://blockscout.com/xdai/mainnet/tx/", GNOSIS_ID, - "https://gnosis.public-rpc.com", "https://blockscout.com/xdai/mainnet/api?")); + "https://rpc.ankr.com/gnosis", "https://blockscout.com/xdai/mainnet/api?")); put(POA_ID, new NetworkInfo(C.POA_NETWORK_NAME, C.POA_SYMBOL, POA_RPC_URL, "https://blockscout.com/poa/core/tx/", POA_ID, POA_RPC_URL, @@ -220,22 +262,6 @@ public abstract class EthereumNetworkBase implements EthereumNetworkRepositoryTy ARTIS_SIGMA1_RPC_URL, "https://explorer.sigma1.artis.network/tx/", ARTIS_SIGMA1_ID, ARTIS_SIGMA1_RPC_URL, "https://explorer.sigma1.artis.network/api?")); - put(KOVAN_ID, new NetworkInfo(C.KOVAN_NETWORK_NAME, C.ETH_SYMBOL, - KOVAN_RPC_URL, - "https://kovan.etherscan.io/tx/", KOVAN_ID, - KOVAN_FALLBACK_RPC_URL, "https://api-kovan.etherscan.io/api?")); - put(ROPSTEN_ID, new NetworkInfo(C.ROPSTEN_NETWORK_NAME, C.ETH_SYMBOL, - ROPSTEN_RPC_URL, - "https://ropsten.etherscan.io/tx/", ROPSTEN_ID, - ROPSTEN_FALLBACK_RPC_URL, "https://api-ropsten.etherscan.io/api?")); - put(SOKOL_ID, new NetworkInfo(C.SOKOL_NETWORK_NAME, C.POA_SYMBOL, - SOKOL_RPC_URL, - "https://blockscout.com/poa/sokol/tx/", SOKOL_ID, - SOKOL_RPC_URL, "https://blockscout.com/poa/sokol/api?")); - put(RINKEBY_ID, new NetworkInfo(C.RINKEBY_NETWORK_NAME, C.ETH_SYMBOL, - RINKEBY_RPC_URL, - "https://rinkeby.etherscan.io/tx/", RINKEBY_ID, - RINKEBY_FALLBACK_RPC_URL, "https://api-rinkeby.etherscan.io/api?")); put(GOERLI_ID, new NetworkInfo(C.GOERLI_NETWORK_NAME, C.GOERLI_SYMBOL, GOERLI_RPC_URL, "https://goerli.etherscan.io/tx/", GOERLI_ID, @@ -287,10 +313,6 @@ public abstract class EthereumNetworkBase implements EthereumNetworkRepositoryTy OPTIMISTIC_MAIN_URL, "https://optimistic.etherscan.io/tx/", OPTIMISTIC_MAIN_ID, OPTIMISTIC_MAIN_FALLBACK_URL, "https://api-optimistic.etherscan.io/api?")); - put(OPTIMISTIC_TEST_ID, new NetworkInfo(C.OPTIMISTIC_TEST_NETWORK, C.ETH_SYMBOL, - OPTIMISTIC_TEST_URL, - "https://kovan-optimistic.etherscan.io/tx/", OPTIMISTIC_TEST_ID, OPTIMISTIC_TEST_FALLBACK_URL, - "https://api-kovan-optimistic.etherscan.io/api?")); put(CRONOS_MAIN_ID, new NetworkInfo(C.CRONOS_MAIN_NETWORK, C.CRONOS_SYMBOL, CRONOS_MAIN_RPC_URL, "https://cronoscan.com/tx/", CRONOS_MAIN_ID, CRONOS_MAIN_RPC_URL, @@ -303,10 +325,6 @@ public abstract class EthereumNetworkBase implements EthereumNetworkRepositoryTy ARBITRUM_MAINNET_RPC, "https://arbiscan.io/tx/", ARBITRUM_MAIN_ID, ARBITRUM_FALLBACK_MAINNET_RPC, "https://api.arbiscan.io/api?")); - put(ARBITRUM_TEST_ID, new NetworkInfo(C.ARBITRUM_TEST_NETWORK, C.ARBITRUM_TEST_SYMBOL, - ARBITRUM_TESTNET_RPC, - "https://testnet.arbiscan.io/tx/", ARBITRUM_TEST_ID, ARBITRUM_FALLBACK_TESTNET_RPC, - "https://testnet.arbiscan.io/api?")); //no transaction API put(PALM_ID, new NetworkInfo(C.PALM_NAME, C.PALM_SYMBOL, PALM_RPC_URL, "https://explorer.palm.io/tx/", PALM_ID, PALM_RPC_FALLBACK_URL, @@ -315,7 +333,6 @@ public abstract class EthereumNetworkBase implements EthereumNetworkRepositoryTy PALM_TEST_RPC_URL, "https://explorer.palm-uat.xyz/tx/", PALM_TEST_ID, PALM_TEST_RPC_FALLBACK_URL, "https://explorer.palm-uat.xyz/api?")); - put(KLAYTN_ID, new NetworkInfo(C.KLAYTN_NAME, C.KLAYTN_SYMBOL, USE_KLAYTN_RPC, "https://scope.klaytn.com/tx/", KLAYTN_ID, KLAYTN_RPC, @@ -338,7 +355,6 @@ public abstract class EthereumNetworkBase implements EthereumNetworkRepositoryTy put(AURORA_TESTNET_ID, new NetworkInfo(C.AURORA_TESTNET_NAME, C.ETH_SYMBOL, AURORA_TESTNET_RPC_URL, "https://testnet.aurorascan.dev/tx/", AURORA_TESTNET_ID, "", "https://api-testnet.aurorascan.dev/api?")); - put(MILKOMEDA_C1_ID, new NetworkInfo(C.MILKOMEDA_NAME, C.MILKOMEDA_SYMBOL, MILKOMEDA_C1_RPC, "https://explorer-mainnet-cardano-evm.c1.milkomeda.com/tx/", MILKOMEDA_C1_ID, "", @@ -347,14 +363,44 @@ public abstract class EthereumNetworkBase implements EthereumNetworkRepositoryTy MILKOMEDA_C1_TEST_RPC, "https://explorer-devnet-cardano-evm.c1.milkomeda.com/tx/", MILKOMEDA_C1_TEST_ID, "", "https://explorer-devnet-cardano-evm.c1.milkomeda.com/api?")); - put(PHI_MAIN_ID, new NetworkInfo(C.PHI_NETWORK_NAME, C.PHI_NETWORK_SYMBOL, - PHI_NETWORK_RPC, - "https://explorer.phi.network/tx/", PHI_MAIN_ID, "https://rpc2.phi.network", - "")); - put(PHI_V2_MAIN_ID, new NetworkInfo(C.PHI_V2_NETWORK_NAME, C.PHI_NETWORK_SYMBOL, - PHI_NETWORK_V2_RPC, - "https://phiscan.com/tx/", PHI_V2_MAIN_ID, "", - "https://phiscan.com/api?")); + put(SEPOLIA_TESTNET_ID, new NetworkInfo(C.SEPOLIA_TESTNET_NAME, C.SEPOLIA_SYMBOL, + SEPOLIA_TESTNET_RPC_URL, + "https://sepolia.etherscan.io/tx/", SEPOLIA_TESTNET_ID, "https://rpc2.sepolia.org", + "https://api-sepolia.etherscan.io/api?")); + put(OPTIMISM_GOERLI_TEST_ID, new NetworkInfo(C.OPTIMISM_GOERLI_TESTNET_NAME, C.OPTIMISM_GOERLI_TEST_SYMBOL, + OPTIMISM_GOERLI_TESTNET_RPC_URL, + "https://blockscout.com/optimism/goerli/tx/", OPTIMISM_GOERLI_TEST_ID, OPTIMISM_GOERLI_TESTNET_FALLBACK_RPC_URL, + "https://blockscout.com/optimism/goerli/api?")); + put(ARBITRUM_GOERLI_TEST_ID, new NetworkInfo(C.ARBITRUM_GOERLI_TESTNET_NAME, C.ARBITRUM_SYMBOL, + ARBITRUM_GOERLI_TESTNET_RPC_URL, + "https://goerli-rollup-explorer.arbitrum.io/tx/", ARBITRUM_GOERLI_TEST_ID, ARBITRUM_GOERLI_TESTNET_FALLBACK_RPC_URL, + "https://goerli-rollup-explorer.arbitrum.io/api?")); + + // Deprecated Networks + put(ROPSTEN_ID, new NetworkInfo(C.ROPSTEN_NETWORK_NAME, C.ETH_SYMBOL, + ROPSTEN_RPC_URL, + "https://ropsten.etherscan.io/tx/", ROPSTEN_ID, + ROPSTEN_RPC_URL, "https://api-ropsten.etherscan.io/api?")); + put(RINKEBY_ID, new NetworkInfo(C.RINKEBY_NETWORK_NAME, C.ETH_SYMBOL, + RINKEBY_RPC_URL, + "https://rinkeby.etherscan.io/tx/", RINKEBY_ID, + RINKEBY_RPC_URL, "https://api-rinkeby.etherscan.io/api?")); + put(KOVAN_ID, new NetworkInfo(C.KOVAN_NETWORK_NAME, C.ETH_SYMBOL, + KOVAN_RPC_URL, + "https://kovan.etherscan.io/tx/", KOVAN_ID, + KOVAN_RPC_URL, "https://api-kovan.etherscan.io/api?")); + put(SOKOL_ID, new NetworkInfo(C.SOKOL_NETWORK_NAME, C.POA_SYMBOL, + SOKOL_RPC_URL, + "https://blockscout.com/poa/sokol/tx/", SOKOL_ID, + SOKOL_RPC_URL, "https://blockscout.com/poa/sokol/api?")); + put(OPTIMISTIC_TEST_ID, new NetworkInfo(C.OPTIMISTIC_TEST_NETWORK, C.ETH_SYMBOL, + OPTIMISTIC_TEST_URL, + "https://kovan-optimistic.etherscan.io/tx/", OPTIMISTIC_TEST_ID, OPTIMISTIC_TEST_FALLBACK_URL, + "https://api-kovan-optimistic.etherscan.io/api?")); + put(ARBITRUM_TEST_ID, new NetworkInfo(C.ARBITRUM_TEST_NETWORK, C.ARBITRUM_TEST_SYMBOL, + ARBITRUM_TESTNET_RPC, + "https://testnet.arbiscan.io/tx/", ARBITRUM_TEST_ID, ARBITRUM_FALLBACK_TESTNET_RPC, + "https://testnet.arbiscan.io/api?")); //no transaction API } }; @@ -362,7 +408,8 @@ public abstract class EthereumNetworkBase implements EthereumNetworkRepositoryTy //the entries are automatically sorted into numerical order private static final LongSparseArray networkMap = builtinNetworkMap.clone(); - private static final LongSparseArray chainLogos = new LongSparseArray() { + private static final LongSparseArray chainLogos = new LongSparseArray() + { { put(MAINNET_ID, R.drawable.ic_token_eth); put(KOVAN_ID, R.drawable.ic_kovan); @@ -401,12 +448,14 @@ public abstract class EthereumNetworkBase implements EthereumNetworkRepositoryTy put(AURORA_TESTNET_ID, R.drawable.ic_aurora_test); put(MILKOMEDA_C1_ID, R.drawable.ic_milkomeda); put(MILKOMEDA_C1_TEST_ID, R.drawable.ic_milkomeda_test); - put(PHI_MAIN_ID, R.drawable.ic_phi_network); - put(PHI_V2_MAIN_ID, R.drawable.ic_phi_network); + put(SEPOLIA_TESTNET_ID, R.drawable.ic_sepolia_test); + put(OPTIMISM_GOERLI_TEST_ID, R.drawable.ic_optimism_testnet_logo); + put(ARBITRUM_GOERLI_TEST_ID, R.drawable.ic_icons_arbitrum_test); } }; - private static final LongSparseArray smallChainLogos = new LongSparseArray() { + private static final LongSparseArray smallChainLogos = new LongSparseArray() + { { put(MAINNET_ID, R.drawable.ic_icons_network_eth); put(KOVAN_ID, R.drawable.ic_kovan); @@ -445,12 +494,14 @@ public abstract class EthereumNetworkBase implements EthereumNetworkRepositoryTy put(AURORA_TESTNET_ID, R.drawable.ic_aurora_test); put(MILKOMEDA_C1_ID, R.drawable.ic_milkomeda); put(MILKOMEDA_C1_TEST_ID, R.drawable.ic_milkomeda_test); - put(PHI_MAIN_ID, R.drawable.ic_phi_network); - put(PHI_V2_MAIN_ID, R.drawable.ic_phi_network); + put(SEPOLIA_TESTNET_ID, R.drawable.ic_sepolia_test); + put(OPTIMISM_GOERLI_TEST_ID, R.drawable.ic_optimism_testnet_logo); + put(ARBITRUM_GOERLI_TEST_ID, R.drawable.ic_icons_arbitrum_test); } }; - private static final LongSparseArray chainColours = new LongSparseArray() { + private static final LongSparseArray chainColours = new LongSparseArray() + { { put(MAINNET_ID, R.color.mainnet); put(KOVAN_ID, R.color.kovan); @@ -489,8 +540,9 @@ public abstract class EthereumNetworkBase implements EthereumNetworkRepositoryTy put(AURORA_TESTNET_ID, R.color.aurora_testnet); put(MILKOMEDA_C1_ID, R.color.milkomeda); put(MILKOMEDA_C1_TEST_ID, R.color.milkomeda_test); - put(PHI_MAIN_ID, R.color.phi_network); - put(PHI_V2_MAIN_ID, R.color.phi_network); + put(SEPOLIA_TESTNET_ID, R.color.sepolia); + put(OPTIMISM_GOERLI_TEST_ID, R.color.optimistic_test); + put(ARBITRUM_GOERLI_TEST_ID, R.color.arbitrum_test); } }; @@ -538,17 +590,20 @@ else if (networkMap.indexOfKey(chainId) >= 0) } else { - return 500 + (int)chainId%500; //fixed ID above 500 + return 500 + (int) chainId % 500; //fixed ID above 500 } } + public static final String INFURA_DOMAIN = "infura.io"; + @Override public boolean hasLockedGas(long chainId) { return hasLockedGas.contains(chainId); } - - static final Map addressOverride = new HashMap() { + + static final Map addressOverride = new HashMap() + { { put(OPTIMISTIC_MAIN_ID, "0x4200000000000000000000000000000000000006"); put(OPTIMISTIC_TEST_ID, "0x4200000000000000000000000000000000000006"); @@ -561,40 +616,58 @@ public boolean hasLockedGas(long chainId) final NetworkInfo[] additionalNetworks; - static class CustomNetworks { + static class CustomNetworks + { private ArrayList list = new ArrayList<>(); private Map mapToTestNet = new HashMap<>(); final transient private PreferenceRepositoryType preferences; - public CustomNetworks(PreferenceRepositoryType preferences) { + public CustomNetworks(PreferenceRepositoryType preferences) + { this.preferences = preferences; restore(); } - public void restore() { + public void restore() + { String networks = preferences.getCustomRPCNetworks(); - if (!TextUtils.isEmpty(networks)) { + if (!TextUtils.isEmpty(networks)) + { CustomNetworks cn = new Gson().fromJson(networks, CustomNetworks.class); this.list = cn.list; this.mapToTestNet = cn.mapToTestNet; checkCustomNetworkSetting(); - for (NetworkInfo info : list) { + for (NetworkInfo info : list) + { + if (!isValidUrl(info.rpcServerUrl)) //ensure RPC doesn't contain malicious code + { + continue; + } + networkMap.put(info.chainId, info); Boolean value = mapToTestNet.get(info.chainId); boolean isTestnet = value != null && value; - if (!isTestnet && !hasValue.contains(info.chainId)) { + if (!isTestnet && !hasValue.contains(info.chainId)) + { hasValue.add(info.chainId); } + else if (isTestnet && !testnetList.contains(info.chainId)) + { + testnetList.add(info.chainId); + } } } } - private void checkCustomNetworkSetting() { - if (list.size() > 0 && !list.get(0).isCustom) { //need to update the list + private void checkCustomNetworkSetting() + { + if (list.size() > 0 && !list.get(0).isCustom) + { //need to update the list List copyList = new ArrayList<>(list); list.clear(); - for (NetworkInfo n : copyList) { + for (NetworkInfo n : copyList) + { boolean isCustom = builtinNetworkMap.indexOfKey(n.chainId) == -1; NetworkInfo newInfo = new NetworkInfo(n.name, n.symbol, n.rpcServerUrl, n.etherscanUrl, n.chainId, n.backupNodeUrl, n.etherscanAPI, isCustom); list.add(newInfo); @@ -606,9 +679,12 @@ private void checkCustomNetworkSetting() { public void save(NetworkInfo info, boolean isTestnet, Long oldChainId) { - if (oldChainId != null) { + if (oldChainId != null) + { updateNetwork(info, isTestnet, oldChainId); - } else { + } + else + { addNetwork(info, isTestnet); } @@ -620,11 +696,14 @@ private void updateNetwork(NetworkInfo info, boolean isTestnet, long oldChainId) { removeNetwork(oldChainId); list.add(info); - - if (!isTestnet) { + if (!isTestnet) + { hasValue.add(info.chainId); } - + else + { + testnetList.add(info.chainId); + } mapToTestNet.put(info.chainId, isTestnet); networkMap.put(info.chainId, info); } @@ -632,14 +711,20 @@ private void updateNetwork(NetworkInfo info, boolean isTestnet, long oldChainId) private void addNetwork(NetworkInfo info, boolean isTestnet) { list.add(info); - if (!isTestnet) { + if (!isTestnet) + { hasValue.add(info.chainId); } + else + { + testnetList.add(info.chainId); + } mapToTestNet.put(info.chainId, isTestnet); networkMap.put(info.chainId, info); } - public void remove(long chainId) { + public void remove(long chainId) + { removeNetwork(chainId); String networks = new Gson().toJson(this); @@ -688,24 +773,42 @@ private void addNetworks(List result, boolean withValue) { for (long networkId : hasValue) { - result.add(networkMap.get(networkId)); + if (!deprecatedNetworkList.contains(networkId)) + { + result.add(networkMap.get(networkId)); + } + } + + for (long networkId : hasValue) + { + if (deprecatedNetworkList.contains(networkId)) + { + result.add(networkMap.get(networkId)); + } } } else { - //sorted array - for (int i = 0; i < networkMap.size(); i++) + for (long networkId : testnetList) + { + if (!deprecatedNetworkList.contains(networkId)) + { + result.add(networkMap.get(networkId)); + } + } + + for (long networkId : testnetList) { - NetworkInfo info = networkMap.valueAt(i); - if (!hasValue.contains(info.chainId) && !result.contains(info)) + if (deprecatedNetworkList.contains(networkId)) { - result.add(info); + result.add(networkMap.get(networkId)); } } } } - public static String getChainOverrideAddress(long chainId) { + public static String getChainOverrideAddress(long chainId) + { return addressOverride.containsKey(chainId) ? addressOverride.get(chainId) : ""; } @@ -734,7 +837,8 @@ public NetworkInfo getNetworkByChain(long chainId) @Override public Single getLastTransactionNonce(Web3j web3j, String walletAddress) { - return Single.fromCallable(() -> { + return Single.fromCallable(() -> + { try { EthGetTransactionCount ethGetTransactionCount = web3j @@ -782,7 +886,7 @@ public List getSelectedFilters(boolean isMainNet) @Override public Long getDefaultNetwork(boolean isMainNet) { - return isMainNet ? CustomViewSettings.primaryChain : RINKEBY_ID; + return isMainNet ? CustomViewSettings.primaryChain : GOERLI_ID; } @Override @@ -837,7 +941,8 @@ public NetworkInfo[] getAllActiveNetworks() } @Override - public void addOnChangeDefaultNetwork(OnNetworkChangeListener onNetworkChanged) { + public void addOnChangeDefaultNetwork(OnNetworkChangeListener onNetworkChanged) + { onNetworkChangedListeners.add(onNetworkChanged); } @@ -854,8 +959,12 @@ public static List getAllMainNetworks() public static String getSecondaryNodeURL(long networkId) { NetworkInfo info = networkMap.get(networkId); - if (info != null) { return info.backupNodeUrl; } - else { + if (info != null) + { + return info.backupNodeUrl; + } + else + { return ""; } } @@ -905,16 +1014,24 @@ public static BigInteger getMaxGasLimit(long chainId) public static String getNodeURLByNetworkId(long networkId) { NetworkInfo info = networkMap.get(networkId); - if (info != null) { return info.rpcServerUrl; } - else { return MAINNET_RPC_URL; } + if (info != null) + { + return info.rpcServerUrl; + } + else + { + return MAINNET_RPC_URL; + } } /** * This is used so as not to leak API credentials to web3; XInfuraAPI is the backup API key checked into github + * * @param networkId * @return */ - public static String getDefaultNodeURL(long networkId) { + public static String getDefaultNodeURL(long networkId) + { NetworkInfo info = networkMap.get(networkId); if (info != null) return info.rpcServerUrl; else return ""; @@ -922,9 +1039,12 @@ public static String getDefaultNodeURL(long networkId) { public static long getNetworkIdFromName(String name) { - if (!TextUtils.isEmpty(name)) { - for (int i = 0; i < networkMap.size(); i++) { - if (name.equals(networkMap.valueAt(i).name)) { + if (!TextUtils.isEmpty(name)) + { + for (int i = 0; i < networkMap.size(); i++) + { + if (name.equals(networkMap.valueAt(i).name)) + { return networkMap.valueAt(i).chainId; } } @@ -994,7 +1114,8 @@ public Token getBlankOverrideToken(NetworkInfo networkInfo) public Single getBlankOverrideTokens(Wallet wallet) { - return Single.fromCallable(() -> { + return Single.fromCallable(() -> + { if (getBlankOverrideToken() == null) { return new Token[0]; @@ -1051,7 +1172,8 @@ public void setActiveMainnet(boolean isMainNet) preferences.setActiveMainnet(isMainNet); } - public void saveCustomRPCNetwork(String networkName, String rpcUrl, long chainId, String symbol, String blockExplorerUrl, String explorerApiUrl, boolean isTestnet, Long oldChainId) { + public void saveCustomRPCNetwork(String networkName, String rpcUrl, long chainId, String symbol, String blockExplorerUrl, String explorerApiUrl, boolean isTestnet, Long oldChainId) + { NetworkInfo builtInNetwork = builtinNetworkMap.get(chainId); boolean isCustom = builtInNetwork == null; @@ -1059,11 +1181,13 @@ public void saveCustomRPCNetwork(String networkName, String rpcUrl, long chainId customNetworks.save(info, isTestnet, oldChainId); } - public void removeCustomRPCNetwork(long chainId) { + public void removeCustomRPCNetwork(long chainId) + { customNetworks.remove(chainId); } - public static NetworkInfo getNetworkInfo(long chainId) { + public static NetworkInfo getNetworkInfo(long chainId) + { return networkMap.get(chainId); } @@ -1100,15 +1224,43 @@ public static String getChainSymbol(long chainId) } } + public static boolean isEventBlockLimitEnforced(long chainId) + { + if (chainId == POLYGON_ID || chainId == POLYGON_TEST_ID) + { + return true; + } + else + { + return false; + } + } + public static BigInteger getMaxEventFetch(long chainId) { if (chainId == POLYGON_ID || chainId == POLYGON_TEST_ID) { - return BigInteger.valueOf(3500L); + return BigInteger.valueOf(POLYGON_BLOCK_SEARCH_INTERVAL); + } + else + { + return BigInteger.valueOf(BLOCK_SEARCH_INTERVAL); + } + } + + public static String getNodeURLForEvents(long chainId) + { + if (chainId == POLYGON_ID) + { + return EthereumNetworkBase.FREE_POLYGON_RPC_URL; // Better than Infura for fetching events + } + else if (chainId == POLYGON_TEST_ID) + { + return EthereumNetworkBase.MUMBAI_FALLBACK_RPC_URL; } else { - return BigInteger.valueOf(10000L); + return getNodeURLByNetworkId(chainId); } } @@ -1118,4 +1270,8 @@ public NetworkInfo getBuiltInNetwork(long chainId) return builtinNetworkMap.get(chainId); } + public static boolean isNetworkDeprecated(long chainId) + { + return deprecatedNetworkList.contains(chainId); + } } diff --git a/app/src/main/java/com/alphawallet/app/repository/EthereumNetworkRepositoryType.java b/app/src/main/java/com/alphawallet/app/repository/EthereumNetworkRepositoryType.java index fb318ada50..085e66c6bf 100644 --- a/app/src/main/java/com/alphawallet/app/repository/EthereumNetworkRepositoryType.java +++ b/app/src/main/java/com/alphawallet/app/repository/EthereumNetworkRepositoryType.java @@ -5,7 +5,6 @@ import com.alphawallet.app.entity.NetworkInfo; import com.alphawallet.app.entity.Wallet; import com.alphawallet.app.entity.tokens.Token; -import com.alphawallet.app.repository.entity.RealmToken; import org.web3j.protocol.Web3j; @@ -54,6 +53,7 @@ public interface EthereumNetworkRepositoryType { void setHasSetNetworkFilters(); boolean isMainNetSelected(); void setActiveMainnet(boolean isMainNet); + String getDappBrowserRPC(long chainId); void saveCustomRPCNetwork(String networkName, String rpcUrl, long chainId, String symbol, String blockExplorerUrl, String explorerApiUrl, boolean isTestnet, Long oldChainId); void removeCustomRPCNetwork(long chainId); diff --git a/app/src/main/java/com/alphawallet/app/repository/HttpServiceHelper.java b/app/src/main/java/com/alphawallet/app/repository/HttpServiceHelper.java index 956d1b685f..7fe9db51bc 100644 --- a/app/src/main/java/com/alphawallet/app/repository/HttpServiceHelper.java +++ b/app/src/main/java/com/alphawallet/app/repository/HttpServiceHelper.java @@ -1,18 +1,43 @@ package com.alphawallet.app.repository; +import static com.alphawallet.app.repository.EthereumNetworkBase.INFURA_DOMAIN; import static com.alphawallet.ethereum.EthereumNetworkBase.KLAYTN_BAOBAB_ID; import static com.alphawallet.ethereum.EthereumNetworkBase.KLAYTN_ID; +import android.text.TextUtils; + +import com.alphawallet.app.service.AWHttpService; + import org.web3j.protocol.http.HttpService; +import okhttp3.Request; + public class HttpServiceHelper { - public static void addRequiredCredentials(long chainId, HttpService httpService, String key, boolean usesProductionKey) + public static void addRequiredCredentials(long chainId, HttpService httpService, String klaytnKey, String infuraKey, boolean usesProductionKey) { + String serviceUrl = ((AWHttpService)httpService).getUrl(); if ((chainId == KLAYTN_BAOBAB_ID || chainId == KLAYTN_ID) && usesProductionKey) { httpService.addHeader("x-chain-id", Long.toString(chainId)); - httpService.addHeader("Authorization", "Basic " + key); + httpService.addHeader("Authorization", "Basic " + klaytnKey); + } + else if (serviceUrl != null && usesProductionKey && serviceUrl.contains(INFURA_DOMAIN) && !TextUtils.isEmpty(infuraKey)) + { + httpService.addHeader("Authorization", "Basic " + infuraKey); + } + } + + public static void addRequiredCredentials(long chainId, Request.Builder service, String klaytnKey, String infuraKey, boolean usesProductionKey, boolean isInfura) + { + if ((chainId == KLAYTN_BAOBAB_ID || chainId == KLAYTN_ID) && usesProductionKey) + { + service.addHeader("x-chain-id", Long.toString(chainId)); + service.addHeader("Authorization", "Basic " + klaytnKey); + } + else if (isInfura && usesProductionKey && !TextUtils.isEmpty(infuraKey)) + { + service.addHeader("Authorization", "Basic " + infuraKey); } } } diff --git a/app/src/main/java/com/alphawallet/app/repository/KeyProvider.java b/app/src/main/java/com/alphawallet/app/repository/KeyProvider.java index 848353be7f..3d30a78718 100644 --- a/app/src/main/java/com/alphawallet/app/repository/KeyProvider.java +++ b/app/src/main/java/com/alphawallet/app/repository/KeyProvider.java @@ -11,8 +11,11 @@ public interface KeyProvider String getKlaytnKey(); String getInfuraKey(); String getSecondaryInfuraKey(); + String getTertiaryInfuraKey(); String getRampKey(); String getOpenSeaKey(); String getMailchimpKey(); String getCoinbasePayAppId(); + String getWalletConnectProjectId(); + String getInfuraSecret(); } diff --git a/app/src/main/java/com/alphawallet/app/repository/KeyProviderJNIImpl.java b/app/src/main/java/com/alphawallet/app/repository/KeyProviderJNIImpl.java index 48f65d7170..9e7418ff57 100644 --- a/app/src/main/java/com/alphawallet/app/repository/KeyProviderJNIImpl.java +++ b/app/src/main/java/com/alphawallet/app/repository/KeyProviderJNIImpl.java @@ -9,6 +9,7 @@ public KeyProviderJNIImpl() public native String getInfuraKey(); public native String getSecondaryInfuraKey(); + public native String getTertiaryInfuraKey(); public native String getBSCExplorerKey(); public native String getAnalyticsKey(); public native String getEtherscanKey(); @@ -20,4 +21,6 @@ public KeyProviderJNIImpl() public native String getOpenSeaKey(); public native String getMailchimpKey(); public native String getCoinbasePayAppId(); + public native String getWalletConnectProjectId(); + public native String getInfuraSecret(); } diff --git a/app/src/main/java/com/alphawallet/app/repository/PreferenceRepositoryType.java b/app/src/main/java/com/alphawallet/app/repository/PreferenceRepositoryType.java index 99b177faad..0f3bfe3d82 100644 --- a/app/src/main/java/com/alphawallet/app/repository/PreferenceRepositoryType.java +++ b/app/src/main/java/com/alphawallet/app/repository/PreferenceRepositoryType.java @@ -2,6 +2,8 @@ import com.alphawallet.app.entity.CurrencyItem; +import java.util.Set; + public interface PreferenceRepositoryType { String getCurrentWalletAddress(); @@ -60,6 +62,8 @@ public interface PreferenceRepositoryType { void setHasSetNetworkFilters(); boolean hasSetNetworkFilters(); void blankHasSetNetworkFilters(); + void cancelAPI23Notification(); + boolean hasCancelledAPI23Notification(); void commit(); @@ -96,4 +100,7 @@ public interface PreferenceRepositoryType { boolean isNewWallet(String address); void setNewWallet(String address, boolean isNewWallet); + + Set getSelectedSwapProviders(); + void setSelectedSwapProviders(Set swapProviders); } diff --git a/app/src/main/java/com/alphawallet/app/repository/SharedPreferenceRepository.java b/app/src/main/java/com/alphawallet/app/repository/SharedPreferenceRepository.java index 61fa1e01f9..b2eaa22a12 100644 --- a/app/src/main/java/com/alphawallet/app/repository/SharedPreferenceRepository.java +++ b/app/src/main/java/com/alphawallet/app/repository/SharedPreferenceRepository.java @@ -10,7 +10,9 @@ import com.alphawallet.app.C; import com.alphawallet.app.entity.CurrencyItem; +import java.util.HashSet; import java.util.Locale; +import java.util.Set; public class SharedPreferenceRepository implements PreferenceRepositoryType { private static final String CURRENT_ACCOUNT_ADDRESS_KEY = "current_account_address"; @@ -41,10 +43,12 @@ public class SharedPreferenceRepository implements PreferenceRepositoryType { public static final String MARSHMALLOW_SUPPORT_WARNING = "marshmallow_version_support_warning_shown"; private static final String LAST_FRAGMENT_ID = "lastfrag_id"; private static final String LAST_VERSION_CODE = "last_version_code"; + private static final String SELECTED_SWAP_PROVIDERS_KEY = "selected_exchanges"; private static final String RATE_APP_SHOWN = "rate_us_shown"; private static final String LAUNCH_COUNT = "launch_count"; private static final String NEW_WALLET = "new_wallet_"; + private static final String API23_NOTIFICATION = "api23_notification"; private final SharedPreferences pref; @@ -243,6 +247,18 @@ public void blankHasSetNetworkFilters() pref.edit().putBoolean(SET_NETWORK_FILTERS, false).apply(); } + @Override + public void cancelAPI23Notification() + { + pref.edit().putBoolean(API23_NOTIFICATION, true).apply(); + } + + @Override + public boolean hasCancelledAPI23Notification() + { + return pref.getBoolean(API23_NOTIFICATION, false); + } + //Ensure settings are committed @SuppressLint("ApplySharedPref") @Override @@ -379,6 +395,18 @@ public void setNewWallet(String address, boolean isNewWallet) pref.edit().putBoolean(keyOf(address), isNewWallet).apply(); } + @Override + public Set getSelectedSwapProviders() + { + return pref.getStringSet(SELECTED_SWAP_PROVIDERS_KEY, new HashSet<>()); + } + + @Override + public void setSelectedSwapProviders(Set swapProviders) + { + pref.edit().putStringSet(SELECTED_SWAP_PROVIDERS_KEY, swapProviders).apply(); + } + @NonNull private String keyOf(String address) { diff --git a/app/src/main/java/com/alphawallet/app/repository/SwapRepository.java b/app/src/main/java/com/alphawallet/app/repository/SwapRepository.java new file mode 100644 index 0000000000..155aa473fb --- /dev/null +++ b/app/src/main/java/com/alphawallet/app/repository/SwapRepository.java @@ -0,0 +1,36 @@ +package com.alphawallet.app.repository; + +import android.content.Context; + +import com.alphawallet.app.entity.lifi.SwapProvider; +import com.alphawallet.app.util.Utils; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; + +import java.util.List; + +public class SwapRepository implements SwapRepositoryType +{ + public static final String FETCH_CHAINS = "https://li.quest/v1/chains"; + public static final String FETCH_TOKENS = "https://li.quest/v1/connections"; + public static final String FETCH_QUOTE = "https://li.quest/v1/quote"; + public static final String FETCH_TOOLS = "https://li.quest/v1/tools"; + public static final String FETCH_ROUTES = "https://li.quest/v1/advanced/routes"; + private static final String SWAP_PROVIDERS_FILENAME = "swap_providers_list.json"; + + private final Context context; + + public SwapRepository(Context context) + { + this.context = context; + } + + @Override + public List getProviders() + { + return new Gson().fromJson(Utils.loadJSONFromAsset(context, SWAP_PROVIDERS_FILENAME), + new TypeToken>() + { + }.getType()); + } +} diff --git a/app/src/main/java/com/alphawallet/app/repository/SwapRepositoryType.java b/app/src/main/java/com/alphawallet/app/repository/SwapRepositoryType.java new file mode 100644 index 0000000000..978babf52b --- /dev/null +++ b/app/src/main/java/com/alphawallet/app/repository/SwapRepositoryType.java @@ -0,0 +1,10 @@ +package com.alphawallet.app.repository; + +import com.alphawallet.app.entity.lifi.SwapProvider; + +import java.util.List; + +public interface SwapRepositoryType +{ + public List getProviders(); +} diff --git a/app/src/main/java/com/alphawallet/app/repository/TokenRepository.java b/app/src/main/java/com/alphawallet/app/repository/TokenRepository.java index b1ef17ac41..c1d251505b 100644 --- a/app/src/main/java/com/alphawallet/app/repository/TokenRepository.java +++ b/app/src/main/java/com/alphawallet/app/repository/TokenRepository.java @@ -21,6 +21,7 @@ import com.alphawallet.app.entity.tokendata.TokenTicker; import com.alphawallet.app.entity.tokens.ERC721Ticket; import com.alphawallet.app.entity.tokens.ERC721Token; +import com.alphawallet.app.entity.tokens.Ticket; import com.alphawallet.app.entity.tokens.Token; import com.alphawallet.app.entity.tokens.TokenCardMeta; import com.alphawallet.app.entity.tokens.TokenInfo; @@ -121,7 +122,8 @@ public TokenRepository( private void buildWeb3jClient(NetworkInfo networkInfo) { AWHttpService publicNodeService = new AWHttpService(networkInfo.rpcServerUrl, networkInfo.backupNodeUrl, okClient, false); - HttpServiceHelper.addRequiredCredentials(networkInfo.chainId, publicNodeService, KeyProviderFactory.get().getKlaytnKey(), EthereumNetworkBase.usesProductionKey); + HttpServiceHelper.addRequiredCredentials(networkInfo.chainId, publicNodeService, KeyProviderFactory.get().getKlaytnKey(), + KeyProviderFactory.get().getInfuraSecret(), EthereumNetworkBase.usesProductionKey); web3jNodeServers.put(networkInfo.chainId, Web3j.build(publicNodeService)); } @@ -142,7 +144,7 @@ public Single checkInterface(Token[] tokens, Wallet wallet) for (int i = 0; i < tokens.length; i++) { Token t = tokens[i]; - if (t.getInterfaceSpec() == ContractType.ERC721_UNDETERMINED || t.getInterfaceSpec() == ContractType.MAYBE_ERC20 || !t.checkBalanceType()) //balance type appears to be wrong + if (t.getInterfaceSpec() == ContractType.ERC721_UNDETERMINED || t.getInterfaceSpec() == ContractType.MAYBE_ERC20) //balance type appears to be wrong { ContractType type = determineCommonType(t.tokenInfo) .onErrorReturnItem(t.getInterfaceSpec()).blockingGet(); @@ -325,6 +327,11 @@ public Single fixFullNames(Wallet wallet, AssetDefinitionService svs) @Override public Single updateTokenBalance(String walletAddress, Token token) { + if (token.isBad()) + { + return Single.fromCallable(() -> BigDecimal.ZERO); + } + Wallet wallet = new Wallet(walletAddress); return updateBalance(wallet, token) .subscribeOn(Schedulers.io()) @@ -410,6 +417,8 @@ public String getTokenImageUrl(long networkId, String address) return localSource.getTokenImageUrl(networkId, address); } + //TODO: Refactor this so the balance update is abstracted into the Token itself + // Once the token is updated we can store it. May need to make the token internal balance non-final private Single updateBalance(final Wallet wallet, final Token token) { return Single.fromCallable(() -> { @@ -428,6 +437,7 @@ private Single updateBalance(final Wallet wallet, final Token token) case ERC875: case ERC875_LEGACY: balanceArray = getBalanceArray875(wallet, token.tokenInfo.chainId, token.getAddress()); + thisToken = new Ticket(thisToken, balanceArray); balance = BigDecimal.valueOf(balanceArray.size()); break; case ERC721_LEGACY: @@ -501,13 +511,14 @@ private BigDecimal updateERC1155Balance(Token token, Wallet wallet) return newBalance; } + //Batch Balance private Single updateBalances(Wallet wallet, Token[] tokens) { return Single.fromCallable(() -> { for (Token t : tokens) { //get balance of any token here - if (t.isERC721() || t.isERC20()) t.balance = checkUint256Balance(wallet, t.tokenInfo.chainId, t.getAddress()); + if (t.isERC20() || t.isNonFungible()) t.balance = checkUint256Balance(wallet, t.tokenInfo.chainId, t.getAddress()); } return tokens; }); @@ -1223,6 +1234,28 @@ public void addImageUrl(long networkId, String address, String imageUrl) localSource.storeTokenUrl(networkId, address, imageUrl); } + public static Web3j getWeb3jServiceForEvents(long chainId) + { + OkHttpClient okClient = new OkHttpClient.Builder() + .connectTimeout(C.CONNECT_TIMEOUT * 3, TimeUnit.SECONDS) + .connectTimeout(C.READ_TIMEOUT * 3, TimeUnit.SECONDS) //events can take longer to render + .writeTimeout(C.LONG_WRITE_TIMEOUT, TimeUnit.SECONDS) + .retryOnConnectionFailure(true) + .build(); + + String nodeUrl = EthereumNetworkBase.getNodeURLForEvents(chainId); + String secondaryNode = EthereumNetworkRepository.getSecondaryNodeURL(chainId); + if (nodeUrl.equals(secondaryNode)) //ensure backup node is different + { + secondaryNode = EthereumNetworkRepository.getNodeURLByNetworkId(chainId); + } + + AWHttpService publicNodeService = new AWHttpService(nodeUrl, secondaryNode, okClient, false); + HttpServiceHelper.addRequiredCredentials(chainId, publicNodeService, KeyProviderFactory.get().getKlaytnKey(), + KeyProviderFactory.get().getInfuraSecret(), EthereumNetworkBase.usesProductionKey); + return Web3j.build(publicNodeService); + } + public static Web3j getWeb3jService(long chainId) { OkHttpClient okClient = new OkHttpClient.Builder() @@ -1231,8 +1264,10 @@ public static Web3j getWeb3jService(long chainId) .writeTimeout(C.LONG_WRITE_TIMEOUT, TimeUnit.SECONDS) .retryOnConnectionFailure(true) .build(); + AWHttpService publicNodeService = new AWHttpService(EthereumNetworkRepository.getNodeURLByNetworkId(chainId), EthereumNetworkRepository.getSecondaryNodeURL(chainId), okClient, false); - HttpServiceHelper.addRequiredCredentials(chainId, publicNodeService, KeyProviderFactory.get().getKlaytnKey(), EthereumNetworkBase.usesProductionKey); + HttpServiceHelper.addRequiredCredentials(chainId, publicNodeService, KeyProviderFactory.get().getKlaytnKey(), + KeyProviderFactory.get().getInfuraSecret(), EthereumNetworkBase.usesProductionKey); return Web3j.build(publicNodeService); } diff --git a/app/src/main/java/com/alphawallet/app/repository/TokensRealmSource.java b/app/src/main/java/com/alphawallet/app/repository/TokensRealmSource.java index d8c78b8ccc..1fb5c79b7c 100644 --- a/app/src/main/java/com/alphawallet/app/repository/TokensRealmSource.java +++ b/app/src/main/java/com/alphawallet/app/repository/TokensRealmSource.java @@ -35,9 +35,7 @@ import java.math.BigInteger; import java.math.RoundingMode; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; @@ -71,25 +69,32 @@ public TokensRealmSource(RealmManager realmManager, EthereumNetworkRepositoryTyp @Override public Single saveTokens(Wallet wallet, Token[] items) { - if (!Utils.isAddressValid(wallet.address)) { return Single.fromCallable(() -> items); } - else return Single.fromCallable(() -> { - try (Realm realm = realmManager.getRealmInstance(wallet)) - { - realm.executeTransaction(r -> { - for (Token token : items) { - if (token.tokenInfo != null && token.tokenInfo.name != null && !token.tokenInfo.name.equals(EXPIRED_CONTRACT) && token.tokenInfo.symbol != null) + if (!Utils.isAddressValid(wallet.address)) + { + return Single.fromCallable(() -> items); + } + else + { + return Single.fromCallable(() -> { + try (Realm realm = realmManager.getRealmInstance(wallet)) + { + realm.executeTransaction(r -> { + for (Token token : items) { - saveTokenLocal(r, token); + if (token.tokenInfo != null && token.tokenInfo.name != null && !token.tokenInfo.name.equals(EXPIRED_CONTRACT) && token.tokenInfo.symbol != null) + { + saveTokenLocal(r, token); + } } - } - }); - } - catch (Exception e) - { - // - } - return items; - }); + }); + } + catch (Exception e) + { + Timber.w(e); + } + return items; + }); + } } @Override @@ -283,11 +288,9 @@ public void updateNFTAssets(String wallet, Token token, List additio realm.executeTransaction(r -> { createTokenIfRequired(r, token); deleteAssets(r, token, removals); - int assetCount = updateNFTAssets(r, token, additions); - //now re-do the balance - assetCount = token.getBalanceRaw().intValue(); + updateNFTAssets(r, token, additions); - setTokenUpdateTime(r, token, assetCount); + setTokenUpdateTime(r, token); }); } catch (Exception e) @@ -308,20 +311,22 @@ private void createTokenIfRequired(Realm realm, Token token) } } - private void setTokenUpdateTime(Realm realm, Token token, int assetCount) + private void setTokenUpdateTime(Realm realm, Token token) { RealmToken realmToken = realm.where(RealmToken.class) .equalTo("address", databaseKey(token)) .findFirst(); + long tokenBalance = token.balance.longValue(); + if (realmToken != null) { - if (!realmToken.isEnabled() && !realmToken.isVisibilityChanged() && assetCount > 0) + if (!realmToken.isEnabled() && !realmToken.isVisibilityChanged() && tokenBalance > 0) { token.tokenInfo.isEnabled = true; realmToken.setEnabled(true); } - else if (!realmToken.isVisibilityChanged() && assetCount == 0) + else if (!realmToken.isVisibilityChanged() && tokenBalance == 0) { token.tokenInfo.isEnabled = false; realmToken.setEnabled(false); @@ -330,32 +335,51 @@ else if (!realmToken.isVisibilityChanged() && assetCount == 0) realmToken.setLastTxTime(System.currentTimeMillis()); realmToken.setAssetUpdateTime(System.currentTimeMillis()); - if (realmToken.getBalance() == null || !realmToken.getBalance().equals(String.valueOf(assetCount))) + if (realmToken.getBalance() == null || !realmToken.getBalance().equals(String.valueOf(tokenBalance))) { - realmToken.setBalance(String.valueOf(assetCount)); + realmToken.setBalance(String.valueOf(tokenBalance)); } } } - private int updateNFTAssets(Realm realm, Token token, List additions) throws RealmException + private void updateNFTAssets(Realm realm, Token token, List additions) throws RealmException { - if (!token.isNonFungible()) return 0; + if (!token.isNonFungible()) return; //load all the old assets Map assetMap = getNFTAssets(realm, token); - int assetCount = assetMap.size(); - for (BigInteger updatedTokenId : additions) + //create addition asset map + Map additionMap = new HashMap<>(); + + for (BigInteger tokenId : additions) + { + NFTAsset asset = assetMap.get(tokenId); + if (asset == null) asset = new NFTAsset(tokenId); + additionMap.put(tokenId, asset); + } + + Map balanceMap = token.queryAssets(additionMap); + + List deleteList = new ArrayList<>(); + + //update token assets + for (Map.Entry entry : balanceMap.entrySet()) { - NFTAsset asset = assetMap.get(updatedTokenId); - if (asset == null || asset.requiresReplacement()) + if (entry.getValue().getBalance().longValue() == 0) { - writeAsset(realm, token, updatedTokenId, new NFTAsset()); - if (asset == null) assetCount++; + deleteList.add(entry.getKey()); + } + else + { + writeAsset(realm, token, entry.getKey(), entry.getValue()); } } - return assetCount; + if (deleteList.size() > 0) + { + deleteAssets(realm, token, deleteList); + } } @Override @@ -429,6 +453,11 @@ public boolean updateTokenBalance(Wallet wallet, Token token, BigDecimal balance { boolean balanceChanged = false; String key = databaseKey(token); + if (token.getWallet() == null) + { + token.setTokenWallet(wallet.address); + } + try (Realm realm = realmManager.getRealmInstance(wallet)) { RealmToken realmToken = realm.where(RealmToken.class) @@ -608,6 +637,11 @@ private void saveToken(Realm realm, Token token) throws RealmException writeAssetContract(realm, token); } + if (oldToken.getInterfaceSpec() != token.getInterfaceSpec()) + { + realmToken.setInterfaceSpec(token.getInterfaceSpec().ordinal()); + } + //check if name needs to be updated if (!TextUtils.isEmpty(token.tokenInfo.name) && (TextUtils.isEmpty(realmToken.getName()) || !realmToken.getName().equals(token.tokenInfo.name))) { @@ -653,7 +687,7 @@ private void writeAssetContract(final Realm realm, Token token) realm.insertOrUpdate(realmNFT); } - // NFT Assets From Opensea + // NFT Assets From Opensea - assume this list is trustworthy - events will catch up with it @Override public Token[] initNFTAssets(Wallet wallet, Token[] tokens) { @@ -667,46 +701,26 @@ public Token[] initNFTAssets(Wallet wallet, Token[] tokens) //load all the assets from the database Map assetMap = getNFTAssets(r, token); - //construct live list - //for erc1155 need to check each potential 'removal'. - //erc721 gets removed by noting token transfer - Map liveMap = token.queryAssets(assetMap); - HashSet deleteList = new HashSet<>(); - - for (BigInteger tokenId : liveMap.keySet()) + //run through the new assets and patch + for (Map.Entry entry : token.getTokenAssets().entrySet()) { - NFTAsset oldAsset = assetMap.get(tokenId); //may be null - NFTAsset newAsset = liveMap.get(tokenId); //never null + NFTAsset fromOpenSea = entry.getValue(); + NFTAsset fromDataBase = assetMap.get(entry.getKey()); - if (newAsset.getBalance().compareTo(BigDecimal.ZERO) == 0) - { - deleteAssets(r, token, Collections.singletonList(tokenId)); - deleteList.add(tokenId); - } - else - { - //token updated or new - if (oldAsset != null) { newAsset.updateAsset(oldAsset); } - writeAsset(r, token, tokenId, newAsset); - } - } + fromOpenSea.updateAsset(fromDataBase); - for (BigInteger tokenId : deleteList) - { - liveMap.remove(tokenId); - } + token.getTokenAssets().put(entry.getKey(), fromOpenSea); - //update token balance & visibility - setTokenUpdateTime(r, token, liveMap.keySet().size()); - token.balance = new BigDecimal(liveMap.keySet().size()); - if (token.getTokenAssets().hashCode() != liveMap.hashCode()) //replace asset map if different - { - token.getTokenAssets().clear(); - token.getTokenAssets().putAll(liveMap); + //write to realm + writeAsset(realm, token, entry.getKey(), fromOpenSea); } } }); } + catch (Exception e) + { + Timber.w(e); + } return tokens; } diff --git a/app/src/main/java/com/alphawallet/app/router/TokenDetailRouter.java b/app/src/main/java/com/alphawallet/app/router/TokenDetailRouter.java index a80fd1d76c..774b326d22 100644 --- a/app/src/main/java/com/alphawallet/app/router/TokenDetailRouter.java +++ b/app/src/main/java/com/alphawallet/app/router/TokenDetailRouter.java @@ -4,11 +4,11 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; -import android.util.Log; import com.alphawallet.app.C; -import com.alphawallet.app.entity.tokens.Token; import com.alphawallet.app.entity.Wallet; +import com.alphawallet.app.entity.tokens.Token; +import com.alphawallet.app.ui.AssetDisplayActivity; import com.alphawallet.app.ui.Erc20DetailActivity; import com.alphawallet.app.ui.NFTActivity; @@ -55,4 +55,14 @@ public void open(Activity activity, Token token, Wallet wallet) intent.setFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK); activity.startActivityForResult(intent, C.TERMINATE_ACTIVITY); } + + public void openLegacyToken(Activity context, Token token, Wallet wallet) + { + Intent intent = new Intent(context, AssetDisplayActivity.class); + intent.putExtra(C.EXTRA_CHAIN_ID, token.tokenInfo.chainId); + intent.putExtra(C.EXTRA_ADDRESS, token.getAddress()); + intent.putExtra(C.Key.WALLET, wallet); + intent.setFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK); + context.startActivityForResult(intent, C.TERMINATE_ACTIVITY); + } } diff --git a/app/src/main/java/com/alphawallet/app/service/AWHttpService.java b/app/src/main/java/com/alphawallet/app/service/AWHttpService.java index 60009021c8..daaa41ab18 100644 --- a/app/src/main/java/com/alphawallet/app/service/AWHttpService.java +++ b/app/src/main/java/com/alphawallet/app/service/AWHttpService.java @@ -161,10 +161,9 @@ private InputStream trySecondaryNode(String request) throws IOException { Timber.d("trySecondaryNode: "); RequestBody requestBody = RequestBody.create(request, JSON_MEDIA_TYPE); - Headers headers = buildHeaders(); okhttp3.Request httpRequest = - new okhttp3.Request.Builder().url(secondaryUrl).headers(headers).post(requestBody).build(); + new okhttp3.Request.Builder().url(secondaryUrl).post(requestBody).build(); okhttp3.Response response; @@ -259,4 +258,9 @@ public HashMap getHeaders() { @Override public void close() throws IOException {} + + public String getUrl() + { + return this.url; + } } diff --git a/app/src/main/java/com/alphawallet/app/service/AlphaWalletService.java b/app/src/main/java/com/alphawallet/app/service/AlphaWalletService.java index 9d6e84cf41..3b95c76ec2 100644 --- a/app/src/main/java/com/alphawallet/app/service/AlphaWalletService.java +++ b/app/src/main/java/com/alphawallet/app/service/AlphaWalletService.java @@ -1,8 +1,9 @@ package com.alphawallet.app.service; -import android.util.Log; +import static com.alphawallet.app.entity.CryptoFunctions.sigFromByteArray; +import static com.alphawallet.token.tools.ParseMagicLink.currencyLink; +import static com.alphawallet.token.tools.ParseMagicLink.spawnable; -import com.alphawallet.app.BuildConfig; import com.alphawallet.app.entity.CryptoFunctions; import com.alphawallet.app.entity.Wallet; import com.alphawallet.app.entity.tokens.Ticket; @@ -33,10 +34,6 @@ import okhttp3.RequestBody; import timber.log.Timber; -import static com.alphawallet.app.entity.CryptoFunctions.sigFromByteArray; -import static com.alphawallet.token.tools.ParseMagicLink.currencyLink; -import static com.alphawallet.token.tools.ParseMagicLink.spawnable; - public class AlphaWalletService { private final OkHttpClient httpClient; @@ -109,6 +106,8 @@ public XMLDsigDescriptor checkTokenScriptSignature(File tokenScriptFile) String result = response.body().string(); JsonObject obj = gson.fromJson(result, JsonObject.class); + if (obj.has("error") || !obj.has("result")) return dsigDescriptor; + String queryResult = obj.get("result").getAsString(); if (queryResult.equals(XML_VERIFIER_PASS)) { diff --git a/app/src/main/java/com/alphawallet/app/service/AssetDefinitionService.java b/app/src/main/java/com/alphawallet/app/service/AssetDefinitionService.java index 88e6099de9..d0c1cef935 100644 --- a/app/src/main/java/com/alphawallet/app/service/AssetDefinitionService.java +++ b/app/src/main/java/com/alphawallet/app/service/AssetDefinitionService.java @@ -25,6 +25,7 @@ import com.alphawallet.app.entity.ContractLocator; import com.alphawallet.app.entity.ContractType; import com.alphawallet.app.entity.FragmentMessenger; +import com.alphawallet.app.entity.QueryResponse; import com.alphawallet.app.entity.TokenLocator; import com.alphawallet.app.entity.Wallet; import com.alphawallet.app.entity.nftassets.NFTAsset; @@ -36,7 +37,6 @@ import com.alphawallet.app.entity.tokenscript.TokenscriptFunction; import com.alphawallet.app.repository.TokenLocalSource; import com.alphawallet.app.repository.TokensRealmSource; -import com.alphawallet.app.repository.TransactionRepositoryType; import com.alphawallet.app.repository.entity.RealmAuxData; import com.alphawallet.app.repository.entity.RealmCertificateData; import com.alphawallet.app.repository.entity.RealmTokenScriptData; @@ -112,8 +112,6 @@ import io.realm.Sort; import io.realm.exceptions.RealmException; import io.realm.exceptions.RealmPrimaryKeyConstraintException; -import okhttp3.OkHttpClient; -import okhttp3.Request; import timber.log.Timber; @@ -135,7 +133,7 @@ public class AssetDefinitionService implements ParseResult, AttributeInterface private static final String EIP5169_KEY_OWNER = "Contract Owner"; //TODO Source this from the contract via owner() private final Context context; - private final OkHttpClient okHttpClient; + private final IPFSServiceType ipfsService; private final Map assetChecked; //Mapping of contract address to when they were last fetched from server private FileObserver fileObserver; //Observer which scans the override directory waiting for file change @@ -145,7 +143,6 @@ public class AssetDefinitionService implements ParseResult, AttributeInterface private final TokensService tokensService; private final TokenLocalSource tokenLocalSource; private final AlphaWalletService alphaWalletService; - private final TransactionRepositoryType transactionRepository; private TokenDefinition cachedDefinition = null; private final ConcurrentHashMap eventList = new ConcurrentHashMap<>(); //List of events built during file load private final Semaphore assetLoadingLock; // used to block if someone calls getAssetDefinitionASync() while loading @@ -158,17 +155,16 @@ public class AssetDefinitionService implements ParseResult, AttributeInterface @Nullable private Disposable checkEventDisposable; - /* Designed with the assmuption that only a single instance of this class at any given time + /* Designed with the assumption that only a single instance of this class at any given time * ^^ The "service" part of AssetDefinitionService is the keyword here. * This is shorthand in the project to indicate this is a singleton that other classes inject. * This is the design pattern of the app. See class RepositoriesModule for constructors which are called at App init only */ - public AssetDefinitionService(OkHttpClient client, Context ctx, NotificationService svs, - RealmManager rm, TokensService tokensService, - TokenLocalSource trs, TransactionRepositoryType trt, - AlphaWalletService alphaService) + public AssetDefinitionService (IPFSServiceType ipfsSvs, Context ctx, NotificationService svs, + RealmManager rm, TokensService tokensService, + TokenLocalSource trs, AlphaWalletService alphaService) { context = ctx; - okHttpClient = client; + ipfsService = ipfsSvs; assetChecked = new ConcurrentHashMap<>(); notificationService = svs; realmManager = rm; @@ -178,7 +174,6 @@ public AssetDefinitionService(OkHttpClient client, Context ctx, NotificationServ { }; //no overridden functions tokenLocalSource = trs; - transactionRepository = trt; assetLoadingLock = new Semaphore(1); eventConnection = new Semaphore(1); //deleteAllEventData(); @@ -929,6 +924,10 @@ private TokenDefinition parseFile(InputStream xmlInputStream) throws Exception private Single handleNewTSFile(File newFile) { + if (!newFile.exists()) + { + return Single.fromCallable(TokenDefinition::new); + } //1. check validity & check for origin tokens //2. check for existing and check if this is a debug file or script from server //3. update signature data @@ -1052,64 +1051,55 @@ private Single fetchXMLFromServer(String address) }); } - private Pair downloadScript(String Uri, long currentFileTime) throws PackageManager.NameNotFoundException + private Pair downloadScript(String Uri, long currentFileTime) { - boolean isIPFS = false; - if (TextUtils.isEmpty(Uri)) return new Pair<>("", false); - SimpleDateFormat format = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss 'GMT'", Locale.ENGLISH); - format.setTimeZone(TimeZone.getTimeZone("UTC")); - String dateFormat = format.format(new Date(currentFileTime)); - - //convert uri if using IPFS: - Uri = Utils.parseIPFS(Uri); - - //prepare Android headers - PackageManager manager = context.getPackageManager(); - PackageInfo info = manager.getPackageInfo( - context.getPackageName(), 0); - String appVersion = info.versionName; - String OSVersion = String.valueOf(Build.VERSION.RELEASE); - - Request.Builder bld = new Request.Builder() - .url(Uri) - .get(); - - if (!Uri.toLowerCase().contains("ipfs.io")) - { - bld.addHeader("Accept", "text/xml; charset=UTF-8") - .addHeader("X-Client-Name", "AlphaWallet") - .addHeader("X-Client-Version", appVersion) - .addHeader("X-Platform-Name", "Android") - .addHeader("X-Platform-Version", OSVersion) - .addHeader("If-Modified-Since", dateFormat); - } - else - { - isIPFS = true; - } + boolean isIPFS = Utils.isIPFS(Uri); - Request request = bld.build(); - - try (okhttp3.Response response = okHttpClient.newCall(request) - .execute()) + try { - switch (response.code()) + QueryResponse response = ipfsService.performIO(Uri, getHeaders(currentFileTime)); + switch (response.code) { default: case HttpURLConnection.HTTP_NOT_MODIFIED: break; case HttpURLConnection.HTTP_OK: - return new Pair<>(response.body().string(), isIPFS); + return new Pair<>(response.body, isIPFS); } } catch (Exception e) { - Timber.e(e); + if (!TextUtils.isEmpty(Uri)) //throws on empty, which is expected + { + Timber.w(e); + } } return new Pair<>("", false); } + private String[] getHeaders(long currentFileTime) throws PackageManager.NameNotFoundException + { + SimpleDateFormat format = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss 'GMT'", Locale.ENGLISH); + format.setTimeZone(TimeZone.getTimeZone("UTC")); + String dateFormat = format.format(new Date(currentFileTime)); + + PackageManager manager = context.getPackageManager(); + PackageInfo info = manager.getPackageInfo( + context.getPackageName(), 0); + String appVersion = info.versionName; + String OSVersion = String.valueOf(Build.VERSION.RELEASE); + + return new String[] { + "Accept", "text/xml; charset=UTF-8", + "X-Client-Name", "AlphaWallet", + "X-Client-Version", appVersion, + "X-Platform-Name", "Android", + "X-Platform-Version", OSVersion, + "If-Modified-Since", dateFormat + }; + } + private boolean definitionIsOutOfDate(TokenDefinition td) { return td != null && !td.nameSpace.equals(TokenDefinition.TOKENSCRIPT_NAMESPACE); @@ -1477,8 +1467,8 @@ private void storeAuxData(String walletAddress, String databaseKey, BigInteger t } } - private void storeEventValue(String walletAddress, EventDefinition ev, EthLog.LogResult log, Attribute attr, - String selectVal) + private void storeEventValue (String walletAddress, EventDefinition ev, EthLog.LogResult log, Attribute attr, + String selectVal) { //store result BigInteger tokenId = EventUtils.getTokenId(ev, log); @@ -1895,7 +1885,8 @@ public String checkFunctionDenied(Token token, String actionName, List getAttributeResultsForTokenIds(Map> attrResults, List requiredAttributeNames, BigInteger tokenId) + private Map getAttributeResultsForTokenIds(Map> attrResults, List requiredAttributeNames, + BigInteger tokenId) { Map results = new HashMap<>(); if (!attrResults.containsKey(tokenId)) return results; //check values @@ -2708,4 +2699,4 @@ private void deleteAWRealm() }); } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/alphawallet/app/service/GasService.java b/app/src/main/java/com/alphawallet/app/service/GasService.java index eec82f2e70..b10e17b829 100644 --- a/app/src/main/java/com/alphawallet/app/service/GasService.java +++ b/app/src/main/java/com/alphawallet/app/service/GasService.java @@ -26,6 +26,7 @@ import com.alphawallet.app.repository.EthereumNetworkBase; import com.alphawallet.app.repository.EthereumNetworkRepository; import com.alphawallet.app.repository.EthereumNetworkRepositoryType; +import com.alphawallet.app.repository.HttpServiceHelper; import com.alphawallet.app.repository.KeyProvider; import com.alphawallet.app.repository.KeyProviderFactory; import com.alphawallet.app.repository.entity.Realm1559Gas; @@ -471,11 +472,16 @@ public Single getChainFeeHistory(int blockCount, String lastBlock, S RequestBody requestBody = RequestBody.create(requestJSON, HttpService.JSON_MEDIA_TYPE); NetworkInfo info = networkRepository.getNetworkByChain(currentChainId); + final Request.Builder rqBuilder = new Request.Builder() + .url(info.rpcServerUrl) + .post(requestBody); + + HttpServiceHelper.addRequiredCredentials(info.chainId, rqBuilder, KeyProviderFactory.get().getKlaytnKey(), + KeyProviderFactory.get().getInfuraSecret(), EthereumNetworkBase.usesProductionKey, EthereumNetworkBase.isInfura(info.rpcServerUrl)); + return Single.fromCallable(() -> { - Request request = new Request.Builder() - .url(info.rpcServerUrl) - .post(requestBody) - .build(); + Request request = rqBuilder.build(); + try (Response response = httpClient.newCall(request).execute()) { if (response.code() / 200 == 1) diff --git a/app/src/main/java/com/alphawallet/app/service/IPFSService.java b/app/src/main/java/com/alphawallet/app/service/IPFSService.java new file mode 100644 index 0000000000..36b82f05c8 --- /dev/null +++ b/app/src/main/java/com/alphawallet/app/service/IPFSService.java @@ -0,0 +1,135 @@ +package com.alphawallet.app.service; + +import android.text.TextUtils; + +import com.alphawallet.app.entity.QueryResponse; +import com.alphawallet.app.entity.tokenscript.TestScript; +import com.alphawallet.app.util.Utils; + +import java.io.IOException; +import java.net.SocketTimeoutException; + +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.Response; +import timber.log.Timber; + +/** + * Created by JB on 3/11/2022. + */ +public class IPFSService implements IPFSServiceType +{ + private final OkHttpClient client; + + public IPFSService(OkHttpClient okHttpClient) + { + this.client = okHttpClient; + } + + public String getContent(String url) + { + try + { + QueryResponse response = performIO(url, null); + + if (response.isSuccessful()) + { + return response.body; + } + else + { + return ""; + } + } + catch (Exception e) + { + Timber.w(e); + return ""; + } + } + + public QueryResponse performIO(String url, String[] headers) throws IOException + { + url = url.trim(); + if (!Utils.isValidUrl(url)) + { + throw new IOException("URL not valid"); + } + + if (Utils.isIPFS(url)) //note that URL might contain IPFS, but not pass 'isValidUrl' + { + return getFromIPFS(url); + } + else + { + return get(url, headers); + } + } + + private QueryResponse get(String url, String[] headers) throws IOException + { + Request.Builder bld = new Request.Builder() + .url(url) + .get(); + + if (headers != null) addHeaders(bld, headers); + + Response response = client.newCall(bld.build()).execute(); + return new QueryResponse(response.code(), response.body().string()); + } + + private QueryResponse getFromIPFS(String url) throws IOException + { + if (isTestCode(url)) return loadTestCode(); + + //try Infura first + String tryIPFS = Utils.resolveIPFS(url, Utils.IPFS_IO_RESOLVER); + //attempt to load content + QueryResponse r; + try + { + r = get(tryIPFS, null); + } + catch (SocketTimeoutException e) + { + //timeout, try second node. Any other failure simply throw back to calling function + tryIPFS = Utils.resolveIPFS(url, Utils.IPFS_INFURA_RESOLVER); + r = get(tryIPFS, null); //if this throws it will be picked up by calling function + } + + return r; + } + + private void addHeaders(Request.Builder bld, String[] headers) throws IOException + { + if (headers.length % 2 != 0) + throw new IOException("Headers must be even value: [{name, value}, {...}]"); + + String name = null; + + for (String header : headers) + { + if (name == null) + { + name = header; + } + else + { + bld.addHeader(name, header); + name = null; + } + } + } + + //For testing + private boolean isTestCode(String url) + { + return (!TextUtils.isEmpty(url) && url.endsWith("QmXXLFBeSjXAwAhbo1344wJSjLgoUrfUK9LE57oVubaRRp")); + } + + private QueryResponse loadTestCode() + { + //restore the TokenScript for the certificate test + return new QueryResponse(200, TestScript.testScriptXXLF); + } +} diff --git a/app/src/main/java/com/alphawallet/app/service/IPFSServiceType.java b/app/src/main/java/com/alphawallet/app/service/IPFSServiceType.java new file mode 100644 index 0000000000..1e5ac9c281 --- /dev/null +++ b/app/src/main/java/com/alphawallet/app/service/IPFSServiceType.java @@ -0,0 +1,14 @@ +package com.alphawallet.app.service; + +import com.alphawallet.app.entity.QueryResponse; + +import java.io.IOException; + +/** + * Created by JB on 4/11/2022. + */ +public interface IPFSServiceType +{ + String getContent(String url); + QueryResponse performIO(String url, String[] headers) throws IOException; +} diff --git a/app/src/main/java/com/alphawallet/app/service/SwapService.java b/app/src/main/java/com/alphawallet/app/service/SwapService.java index 512947c6dd..fab5804e2e 100644 --- a/app/src/main/java/com/alphawallet/app/service/SwapService.java +++ b/app/src/main/java/com/alphawallet/app/service/SwapService.java @@ -3,24 +3,29 @@ import android.net.Uri; import com.alphawallet.app.C; -import com.alphawallet.app.entity.lifi.Connection; +import com.alphawallet.app.entity.lifi.RouteOptions; +import com.alphawallet.app.entity.lifi.Token; +import com.alphawallet.app.repository.SwapRepository; import com.alphawallet.app.util.BalanceUtils; import com.alphawallet.app.util.JsonUtils; +import org.json.JSONException; +import org.json.JSONObject; + import java.util.Objects; +import java.util.Set; import java.util.concurrent.TimeUnit; import io.reactivex.Single; +import okhttp3.MediaType; import okhttp3.OkHttpClient; import okhttp3.Request; +import okhttp3.RequestBody; import okhttp3.ResponseBody; import timber.log.Timber; public class SwapService { - private static final String FETCH_CHAINS = "https://li.quest/v1/chains"; - private static final String FETCH_TOKENS = "https://li.quest/v1/connections"; - private static final String SWAP_TOKEN = "https://li.quest/v1/quote"; private static OkHttpClient httpClient; public SwapService() @@ -38,8 +43,18 @@ private Request buildRequest(String api) Request.Builder requestB = new Request.Builder() .url(api) .header("User-Agent", "Chrome/74.0.3729.169") - .method("GET", null) - .addHeader("Content-Type", "application/json"); + .addHeader("Content-Type", "application/json") + .get(); + return requestB.build(); + } + + private Request buildPostRequest(String api, RequestBody requestBody) + { + Request.Builder requestB = new Request.Builder() + .url(api) + .header("User-Agent", "Chrome/74.0.3729.169") + .addHeader("Content-Type", "application/json") + .post(requestBody); return requestB.build(); } @@ -69,49 +84,185 @@ private String executeRequest(String api) return JsonUtils.EMPTY_RESULT; } + private String executePostRequest(String api, RequestBody requestBody) + { + try (okhttp3.Response response = httpClient.newCall(buildPostRequest(api, requestBody)).execute()) + { + if (response.isSuccessful()) + { + ResponseBody responseBody = response.body(); + if (responseBody != null) + { + return responseBody.string(); + } + } + else + { + return Objects.requireNonNull(response.body()).string(); + } + } + catch (Exception e) + { + Timber.e(e); + return e.getMessage(); + } + + return JsonUtils.EMPTY_RESULT; + } + public Single getChains() { return Single.fromCallable(this::fetchChains); } + public Single getTools() + { + return Single.fromCallable(this::fetchTools); + } + public Single getConnections(long from, long to) { return Single.fromCallable(() -> fetchPairs(from, to)); } - public Single getQuote(Connection.LToken source, Connection.LToken dest, String address, String amount, String slippage) + public Single getQuote(Token source, + Token dest, + String address, + String amount, + String slippage, + String allowExchanges) + { + return Single.fromCallable(() -> fetchQuote(source, dest, address, amount, slippage, allowExchanges)); + } + + public Single getRoutes(Token source, + Token dest, + String address, + String amount, + String slippage, + Set exchanges) { - return Single.fromCallable(() -> fetchQuote(source, dest, address, amount, slippage)); + return Single.fromCallable(() -> fetchRoutes(source, dest, address, amount, slippage, exchanges)); + } + + public Single getRoutes(String fromChainId, + String toChainId, + String fromTokenAddress, + String toTokenAddress, + String fromAddress, + String fromAmount, + String slippage, + Set exchanges) + { + return Single.fromCallable(() -> fetchRoutes(fromChainId, toChainId, fromTokenAddress, toTokenAddress, fromAddress, fromAmount, slippage, exchanges)); } public String fetchChains() { Uri.Builder builder = new Uri.Builder(); - builder.encodedPath(FETCH_CHAINS); + builder.encodedPath(SwapRepository.FETCH_CHAINS); + return executeRequest(builder.build().toString()); + } + + public String fetchTools() + { + Uri.Builder builder = new Uri.Builder(); + builder.encodedPath(SwapRepository.FETCH_TOOLS); return executeRequest(builder.build().toString()); } public String fetchPairs(long fromChain, long toChain) { Uri.Builder builder = new Uri.Builder(); - builder.encodedPath(FETCH_TOKENS) + builder.encodedPath(SwapRepository.FETCH_TOKENS) .appendQueryParameter("fromChain", String.valueOf(fromChain)) .appendQueryParameter("toChain", String.valueOf(toChain)); return executeRequest(builder.build().toString()); } - public String fetchQuote(Connection.LToken source, Connection.LToken dest, String address, String amount, String slippage) + public String fetchQuote(Token source, + Token dest, + String address, + String amount, + String slippage, + String allowExchanges) { Uri.Builder builder = new Uri.Builder(); - builder.encodedPath(SWAP_TOKEN) + builder.encodedPath(SwapRepository.FETCH_QUOTE) .appendQueryParameter("fromChain", String.valueOf(source.chainId)) .appendQueryParameter("toChain", String.valueOf(dest.chainId)) .appendQueryParameter("fromToken", source.address) .appendQueryParameter("toToken", dest.address) .appendQueryParameter("fromAddress", address) .appendQueryParameter("fromAmount", BalanceUtils.getRawFormat(amount, source.decimals)) -// .appendQueryParameter("order", "RECOMMENDED") + .appendQueryParameter("allowExchanges", allowExchanges) .appendQueryParameter("slippage", slippage); return executeRequest(builder.build().toString()); } + + public String fetchRoutes(Token source, + Token dest, + String address, + String amount, + String slippage, + Set exchanges) + { + RouteOptions options = new RouteOptions(); + options.slippage = slippage; + options.exchanges.allow.addAll(exchanges); + + RequestBody body = null; + try + { + JSONObject json = new JSONObject(); + json.put("fromChainId", String.valueOf(source.chainId)); + json.put("toChainId", String.valueOf(dest.chainId)); + json.put("fromTokenAddress", source.address); + json.put("toTokenAddress", dest.address); + json.put("fromAddress", address); + json.put("fromAmount", BalanceUtils.getRawFormat(amount, source.decimals)); + json.put("options", options.getJson()); + body = RequestBody.create(json.toString(), MediaType.parse("application/json")); + } + catch (JSONException e) + { + Timber.e(e); + } + + return executePostRequest(SwapRepository.FETCH_ROUTES, body); + } + + public String fetchRoutes(String fromChainId, + String toChainId, + String fromTokenAddress, + String toTokenAddress, + String fromAddress, + String fromAmount, + String slippage, + Set exchanges) + { + RouteOptions options = new RouteOptions(); + options.slippage = slippage; + options.exchanges.allow.addAll(exchanges); + + RequestBody body = null; + try + { + JSONObject json = new JSONObject(); + json.put("fromChainId", fromChainId); + json.put("toChainId", toChainId); + json.put("fromTokenAddress", fromTokenAddress); + json.put("toTokenAddress", toTokenAddress); + json.put("fromAddress", fromAddress); + json.put("fromAmount", fromAmount); + json.put("options", options.getJson()); + body = RequestBody.create(json.toString(), MediaType.parse("application/json")); + } + catch (JSONException e) + { + Timber.e(e); + } + + return executePostRequest(SwapRepository.FETCH_ROUTES, body); + } } diff --git a/app/src/main/java/com/alphawallet/app/service/TickerService.java b/app/src/main/java/com/alphawallet/app/service/TickerService.java index eda5013178..734ddd4c97 100644 --- a/app/src/main/java/com/alphawallet/app/service/TickerService.java +++ b/app/src/main/java/com/alphawallet/app/service/TickerService.java @@ -16,10 +16,9 @@ import static com.alphawallet.ethereum.EthereumNetworkBase.MAINNET_ID; import static com.alphawallet.ethereum.EthereumNetworkBase.MILKOMEDA_C1_ID; import static com.alphawallet.ethereum.EthereumNetworkBase.OPTIMISTIC_MAIN_ID; -import static com.alphawallet.ethereum.EthereumNetworkBase.PHI_V2_MAIN_ID; import static com.alphawallet.ethereum.EthereumNetworkBase.POA_ID; import static com.alphawallet.ethereum.EthereumNetworkBase.POLYGON_ID; -import static com.alphawallet.ethereum.EthereumNetworkBase.RINKEBY_ID; +import static com.alphawallet.ethereum.EthereumNetworkBase.POLYGON_TEST_ID; import static org.web3j.protocol.core.methods.request.Transaction.createEthCallTransaction; import android.text.TextUtils; @@ -80,18 +79,17 @@ public class TickerService { private static final int UPDATE_TICKER_CYCLE = 5; //5 Minutes private static final String MEDIANIZER = "0x729D19f657BD0614b4985Cf1D82531c67569197B"; - private static final String MARKET_ORACLE_CONTRACT = "0xf155a7eb4a2993c8cf08a76bca137ee9ac0a01d8"; + private static final String MARKET_ORACLE_CONTRACT = "0xdAcAf435f241B1a062B021abEED9CA2F76F22F8D"; private static final String CONTRACT_ADDR = "[CONTRACT_ADDR]"; private static final String CHAIN_IDS = "[CHAIN_ID]"; private static final String CURRENCY_TOKEN = "[CURRENCY]"; private static final String COINGECKO_CHAIN_CALL = "https://api.coingecko.com/api/v3/simple/price?ids=" + CHAIN_IDS + "&vs_currencies=" + CURRENCY_TOKEN + "&include_24hr_change=true"; private static final String COINGECKO_API = "https://api.coingecko.com/api/v3/simple/token_price/" + CHAIN_IDS + "?contract_addresses=" + CONTRACT_ADDR + "&vs_currencies=" + CURRENCY_TOKEN + "&include_24hr_change=true"; private static final String DEXGURU_API = "https://api.dex.guru/v1/tokens/" + CONTRACT_ADDR + "-" + CHAIN_IDS; - private static final String PHI_TICKER_API = "https://price.phi.network/api/ticker?filter=WPHI"; private static final String CURRENCY_CONV = "currency"; private static final boolean ALLOW_UNVERIFIED_TICKERS = false; //allows verified:false tickers from DEX.GURU. Not recommended public static final long TICKER_TIMEOUT = DateUtils.WEEK_IN_MILLIS; //remove ticker if not seen in one week - public static final long TICKER_STALE_TIMEOUT = 15 * DateUtils.MINUTE_IN_MILLIS; //try to use market API if AlphaWallet market oracle not updating + public static final long TICKER_STALE_TIMEOUT = 30 * DateUtils.MINUTE_IN_MILLIS; //Use market API if AlphaWallet market oracle not updating private final OkHttpClient httpClient; private final PreferenceRepositoryType sharedPrefs; @@ -102,6 +100,7 @@ public class TickerService private static String currentCurrencySymbol; private static final Map canUpdate = new ConcurrentHashMap<>(); private static final Map dexGuruQuery = new ConcurrentHashMap<>(); + private static long lastTickerUpdate; @Nullable private Disposable tickerUpdateTimer; @@ -120,11 +119,12 @@ public TickerService(OkHttpClient httpClient, PreferenceRepositoryType sharedPre resetTickerUpdate(); initCurrency(); + lastTickerUpdate = 0; } public void updateTickers() { - if (mainTickerUpdate != null && !mainTickerUpdate.isDisposed()) + if (mainTickerUpdate != null && !mainTickerUpdate.isDisposed() && System.currentTimeMillis() > (lastTickerUpdate + DateUtils.MINUTE_IN_MILLIS)) { return; //do not update if update is currently in progress } @@ -142,7 +142,6 @@ private void tickerUpdate() .flatMap(this::updateTickersFromOracle) .flatMap(this::fetchTickersSeparatelyIfRequired) .flatMap(this::addArtisTicker) - .map(this::addPhiTickers) .map(this::checkTickers) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -153,6 +152,7 @@ private void tickersUpdated(int tickerCount) { Timber.d("Tickers Updated: %s", tickerCount); mainTickerUpdate = null; + lastTickerUpdate = System.currentTimeMillis(); } public Single updateCurrencyConversion() @@ -228,7 +228,7 @@ private Single updateTickersFromOracle(double conversionRate) currentConversionRate = conversionRate; return Single.fromCallable(() -> { int tickerSize = 0; - final Web3j web3j = TokenRepository.getWeb3jService(RINKEBY_ID); + final Web3j web3j = TokenRepository.getWeb3jService(POLYGON_TEST_ID); //fetch current tickers Function function = getTickers(); String responseValue = callSmartContractFunction(web3j, function, MARKET_ORACLE_CONTRACT); @@ -494,50 +494,6 @@ private TokenTicker addArtisTickers(TokenTicker tokenTicker) return tokenTicker; } - private int addPhiTickers(int tickerCount) - { - //fetch phi price - Request request = new Request.Builder() - .url(PHI_TICKER_API) - .get() - .build(); - - try (okhttp3.Response response = httpClient.newCall(request) - .execute()) - { - if ((response.code() / 100) == 2 && response.body() != null) - { - String result = response.body() - .string(); - JSONObject data = new JSONObject(result); - JSONObject tickerData = (JSONObject) data.get("data"); - JSONObject quoteData = (JSONObject) tickerData.get("quotes"); - JSONObject usdQuote = (JSONObject) quoteData.get("USD"); - - double priceChange = usdQuote.getDouble("price_change_24h"); - double price = usdQuote.getDouble("price"); - double percentChange = (priceChange / price) * 100.0; - - String currentPrice = String.valueOf(price * currentConversionRate); - - TokenTicker phiTicker = new TokenTicker(currentPrice, - String.valueOf(percentChange), - currentCurrencySymbolTxt, - "", - System.currentTimeMillis()); - - ethTickers.put(PHI_V2_MAIN_ID, phiTicker); - return tickerCount + 1; - } - } - catch (Exception e) - { - Timber.e(e); - } - - return tickerCount; - } - private TokenTicker decodeCoinGeckoTicker(JSONObject eth) { TokenTicker tTicker; diff --git a/app/src/main/java/com/alphawallet/app/service/TokensService.java b/app/src/main/java/com/alphawallet/app/service/TokensService.java index 2bcbd69851..17d49ea149 100644 --- a/app/src/main/java/com/alphawallet/app/service/TokensService.java +++ b/app/src/main/java/com/alphawallet/app/service/TokensService.java @@ -132,18 +132,17 @@ private void checkUnknownTokens() { ContractAddress t = unknownTokens.pollFirst(); Token cachedToken = t != null ? getToken(t.chainId, t.address) : null; - ContractType type = cachedToken != null ? cachedToken.getInterfaceSpec() : ContractType.NOT_SET; if (t != null && t.address.length() > 0 && (cachedToken == null || TextUtils.isEmpty(cachedToken.tokenInfo.name))) { - queryUnknownTokensDisposable = tokenRepository.update(t.address, t.chainId, type).toObservable() //fetch tokenInfo - .filter(tokenInfo -> (!TextUtils.isEmpty(tokenInfo.name) || !TextUtils.isEmpty(tokenInfo.symbol)) && tokenInfo.chainId != 0) - .map(tokenInfo -> { tokenInfo.isEnabled = false; return tokenInfo; }) //set default visibility to false - .flatMap(tokenInfo -> tokenRepository.determineCommonType(tokenInfo).toObservable() - .map(contractType -> tokenFactory.createToken(tokenInfo, contractType, ethereumNetworkRepository.getNetworkByChain(t.chainId).getShortName()))) + ContractType type = tokenRepository.determineCommonType(new TokenInfo(t.address, "", "", 18, false, t.chainId)).blockingGet(); + + queryUnknownTokensDisposable = tokenRepository.update(t.address, t.chainId, type) //fetch tokenInfo + .map(tokenInfo -> tokenFactory.createToken(tokenInfo, type, ethereumNetworkRepository.getNetworkByChain(t.chainId).getShortName())) + .flatMap(token -> tokenRepository.updateTokenBalance(currentAddress, token)) .subscribeOn(Schedulers.io()) .observeOn(Schedulers.io()) - .subscribe(this::finishAddToken, err -> onCheckError(err, t), this::finishTokenCheck); + .subscribe(this::finishAddToken, err -> onCheckError(err, t)); } else if (t == null) { @@ -159,19 +158,11 @@ private void onCheckError(Throwable throwable, ContractAddress t) Timber.e(throwable); } - private void finishTokenCheck() + private void finishAddToken(BigDecimal balance) { queryUnknownTokensDisposable = null; } - private void finishAddToken(Token token) - { - if (token != null && token.getInterfaceSpec() != ContractType.OTHER) - { - tokenStoreList.add(token); - } - } - public Token getToken(long chainId, String addr) { if (TextUtils.isEmpty(currentAddress) || TextUtils.isEmpty(addr)) return null; diff --git a/app/src/main/java/com/alphawallet/app/service/TransactionsNetworkClient.java b/app/src/main/java/com/alphawallet/app/service/TransactionsNetworkClient.java index ce974a573f..5ab847f094 100644 --- a/app/src/main/java/com/alphawallet/app/service/TransactionsNetworkClient.java +++ b/app/src/main/java/com/alphawallet/app/service/TransactionsNetworkClient.java @@ -7,7 +7,6 @@ import static com.alphawallet.ethereum.EthereumNetworkBase.AURORA_MAINNET_ID; import static com.alphawallet.ethereum.EthereumNetworkBase.AURORA_TESTNET_ID; import static com.alphawallet.ethereum.EthereumNetworkBase.BINANCE_MAIN_ID; -import static com.alphawallet.ethereum.EthereumNetworkBase.BINANCE_TEST_ID; import static com.alphawallet.ethereum.EthereumNetworkBase.POLYGON_ID; import static com.alphawallet.ethereum.EthereumNetworkBase.POLYGON_TEST_ID; @@ -34,6 +33,7 @@ import com.alphawallet.app.repository.entity.RealmToken; import com.alphawallet.app.repository.entity.RealmTransaction; import com.alphawallet.app.repository.entity.RealmTransfer; +import com.alphawallet.app.util.Utils; import com.alphawallet.token.entity.ContractAddress; import com.google.gson.Gson; @@ -61,8 +61,8 @@ public class TransactionsNetworkClient implements TransactionsNetworkClientType { private static final String TAG = "TXNETCLIENT"; - private final int PAGESIZE = 800; - private final int SYNC_PAGECOUNT = 2; //how many pages to read when we first sync the account - means we store the first 1600 transactions only + private final int PAGESIZE = 1000; + private final int SYNC_PAGECOUNT = 1; //how many pages to read when we first sync the account - means we store the first 1600 transactions only public static final int TRANSFER_RESULT_MAX = 250; //check 200 records when we first get a new account //Note: if user wants to view transactions older than this, we fetch from etherscan on demand. //Generally this would only happen when watching extremely active accounts for curiosity @@ -423,6 +423,11 @@ private EtherscanTransaction[] readTransactions(NetworkInfo networkInfo, TokensS fullUrl = sb.toString(); + if (!Utils.isValidUrl(fullUrl)) + { + return new EtherscanTransaction[0]; + } + Request request = new Request.Builder() .url(fullUrl) .get() @@ -617,12 +622,13 @@ private int calcTokenDecimals(EtherscanEvent ev0) return tokenDecimal; } - private void writeAssets(Map> eventMap, Token token, String walletAddress, - String contractAddress, TokensService svs, boolean newToken) + private void writeAssets (Map> eventMap, Token token, String walletAddress, + String contractAddress, TokensService svs, boolean newToken) { - List additions = new ArrayList<>(); - List removals = new ArrayList<>(); + HashSet additions = new HashSet<>(); + HashSet removals = new HashSet<>(); + //run through addition/removal in chronological order for (EtherscanEvent ev : eventMap.get(contractAddress)) { BigInteger tokenId = getTokenId(ev.tokenID); @@ -631,12 +637,12 @@ private void writeAssets(Map> eventMap, Token token if (ev.to.equalsIgnoreCase(walletAddress)) { - if (!additions.contains(tokenId)) { additions.add(tokenId); } + additions.add(tokenId); removals.remove(tokenId); } else { - if (!removals.contains(tokenId)) { removals.add(tokenId); } + removals.add(tokenId); additions.remove(tokenId); } } @@ -648,7 +654,7 @@ private void writeAssets(Map> eventMap, Token token if (additions.size() > 0 || removals.size() > 0) { - svs.updateAssets(token, additions, removals); + svs.updateAssets(token, new ArrayList<>(additions), new ArrayList<>(removals)); } } @@ -664,6 +670,11 @@ private String readNextTxBatch(String walletAddress, NetworkInfo networkInfo, lo "&page=1&offset=" + TRANSFER_RESULT_MAX + "&sort=asc" + getNetworkAPIToken(networkInfo); + if (!Utils.isValidUrl(fullUrl)) + { + return "0"; + } + Request request = new Request.Builder() .url(fullUrl) .header("User-Agent", "Chrome/74.0.3729.169") @@ -693,7 +704,7 @@ private String getNetworkAPIToken(NetworkInfo networkInfo) { return ETHERSCAN_API_KEY; } - else if (networkInfo.chainId == BINANCE_TEST_ID || networkInfo.chainId == BINANCE_MAIN_ID) + else if (networkInfo.chainId == BINANCE_MAIN_ID) { return BSC_EXPLORER_API_KEY; } @@ -703,7 +714,7 @@ else if (networkInfo.chainId == POLYGON_ID || networkInfo.chainId == POLYGON_TES } else if (networkInfo.chainId == AURORA_MAINNET_ID || networkInfo.chainId == AURORA_TESTNET_ID) { - return AURORASCAN_API_KEY; + return AURORASCAN_API_KEY; } else { @@ -714,7 +725,8 @@ else if (networkInfo.chainId == AURORA_MAINNET_ID || networkInfo.chainId == AURO private EtherscanTransaction[] readCovalentTransactions(TokensService svs, String accountAddress, NetworkInfo networkInfo, boolean ascending, int page, int pageSize) throws JSONException { String covalent = "" + networkInfo.chainId + "/address/" + accountAddress.toLowerCase() + "/transactions_v2/?"; - String args = "block-signed-at-asc=" + (ascending ? "true" : "false") + "&page-number=" + (page - 1) + "&page-size=" + pageSize + "&key=" + keyProvider.getCovalentKey(); //read logs to get all the transfers + String args = "block-signed-at-asc=" + (ascending ? "true" : "false") + "&page-number=" + (page - 1) + "&page-size=" + + pageSize + "&key=" + keyProvider.getCovalentKey(); //read logs to get all the transfers String fullUrl = networkInfo.etherscanAPI.replace(COVALENT, covalent); String result = null; @@ -958,8 +970,8 @@ private void resetBlockRead(Realm r, long chainId, String walletAddress) } } - private void writeEvents(Realm instance, EtherscanEvent[] events, String walletAddress, - @NonNull NetworkInfo networkInfo, final boolean isNFT) throws Exception + private void writeEvents (Realm instance, EtherscanEvent[] events, String walletAddress, + @NonNull NetworkInfo networkInfo, final boolean isNFT) throws Exception { String TO_TOKEN = "[TO_ADDRESS]"; String FROM_TOKEN = "[FROM_ADDRESS]"; @@ -972,12 +984,14 @@ private void writeEvents(Realm instance, EtherscanEvent[] events, String walletA //write event list for (EtherscanEvent ev : events) { - boolean scanAsNFT = isNFT || ((ev.tokenDecimal == null || ev.tokenDecimal.length() == 0 || ev.tokenDecimal.equals("0")) && (ev.tokenID != null && ev.tokenID.length() > 0)); + boolean scanAsNFT = isNFT || ((ev.tokenDecimal == null || ev.tokenDecimal.length() == 0 || ev.tokenDecimal.equals("0")) && + (ev.tokenID != null && ev.tokenID.length() > 0)); Transaction tx = scanAsNFT ? ev.createNFTTransaction(networkInfo) : ev.createTransaction(networkInfo); //find tx name String activityName = tx.getEventName(walletAddress); - String valueList = VALUES.replace(TO_TOKEN, ev.to).replace(FROM_TOKEN, ev.from).replace(AMOUNT_TOKEN, scanAsNFT ? ev.tokenID : ev.value); //Etherscan sometimes interprets NFT transfers as FT's + //Etherscan sometimes interprets NFT transfers as FT's + String valueList = VALUES.replace(TO_TOKEN, ev.to).replace(FROM_TOKEN, ev.from).replace(AMOUNT_TOKEN, scanAsNFT ? ev.tokenID : ev.value); storeTransferData(r, tx.hash, valueList, activityName, ev.contractAddress); //ensure we have fetched the transaction for each hash writeTransaction(r, tx, ev.contractAddress, networkInfo.etherscanAPI.contains(COVALENT) ? null : txFetches); diff --git a/app/src/main/java/com/alphawallet/app/service/TransactionsService.java b/app/src/main/java/com/alphawallet/app/service/TransactionsService.java index c7326eb8f0..48adb845ed 100644 --- a/app/src/main/java/com/alphawallet/app/service/TransactionsService.java +++ b/app/src/main/java/com/alphawallet/app/service/TransactionsService.java @@ -58,7 +58,7 @@ public class TransactionsService private final LongSparseArray chainTransferCheckTimes = new LongSparseArray<>(); //TODO: Use this to coordinate token checks on chains private final LongSparseArray chainTransactionCheckTimes = new LongSparseArray<>(); - private static final LongSparseArray currentBlocks = new LongSparseArray<>(); + private static final LongSparseArray currentBlocks = new LongSparseArray<>(); private static final ConcurrentLinkedQueue requiredTransactions = new ConcurrentLinkedQueue<>(); private final static int TRANSACTION_DROPPED = -1; @@ -161,10 +161,6 @@ private void checkTransfers() if (currentChainIndex >= filters.size()) currentChainIndex = 0; readTokenMoves(filters.get(currentChainIndex), nftCheck); //check NFTs for same chain on next iteration or advance to next chain Pair pendingChainData = getNextChainIndex(currentChainIndex, nftCheck, filters); - if (pendingChainData.first != currentChainIndex) - { - updateCurrentBlock(filters.get(currentChainIndex)); - } currentChainIndex = pendingChainData.first; nftCheck = pendingChainData.second; } @@ -289,13 +285,6 @@ else if (checkTime < oldestCheck) } } - private void updateCurrentBlock(final long chainId) - { - fetchCurrentBlock(chainId).subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(blockValue -> currentBlocks.put(chainId, blockValue), onError -> currentBlocks.put(chainId, BigInteger.ZERO)).isDisposed(); - } - private static Single fetchCurrentBlock(final long chainId) { return Single.fromCallable(() -> { @@ -305,7 +294,7 @@ private static Single fetchCurrentBlock(final long chainId) String blockValStr = ethBlock.getBlock().getNumberRaw(); if (!TextUtils.isEmpty(blockValStr) && blockValStr.length() > 2) return Numeric.toBigInt(blockValStr); - else return currentBlocks.get(chainId, BigInteger.ZERO); + else return currentBlocks.get(chainId, new CurrentBlockTime(BigInteger.ZERO)).blockNumber; }); } @@ -537,14 +526,14 @@ public void markPending(Transaction tx) public static BigInteger getCurrentBlock(long chainId) { - BigInteger currentBlock = currentBlocks.get(chainId, BigInteger.ZERO); - if (currentBlock.equals(BigInteger.ZERO)) + CurrentBlockTime currentBlock = currentBlocks.get(chainId, new CurrentBlockTime(BigInteger.ZERO)); + if (currentBlock.blockReadRequiresUpdate()) { - currentBlock = fetchCurrentBlock(chainId).blockingGet(); + currentBlock = new CurrentBlockTime(fetchCurrentBlock(chainId).blockingGet()); currentBlocks.put(chainId, currentBlock); } - return currentBlock; + return currentBlock.blockNumber; } private void checkPendingTransactions() @@ -642,4 +631,22 @@ private String getNextUncachedTx() return txHashData; } + + private static class CurrentBlockTime + { + public final long readTime; + public final BigInteger blockNumber; + + public CurrentBlockTime(BigInteger blockNo) + { + readTime = System.currentTimeMillis(); + blockNumber = blockNo; + } + + public boolean blockReadRequiresUpdate() + { + // update every 10 seconds if required + return blockNumber.equals(BigInteger.ZERO) || System.currentTimeMillis() > (readTime + 10 * DateUtils.SECOND_IN_MILLIS); + } + } } diff --git a/app/src/main/java/com/alphawallet/app/ui/AddTokenActivity.java b/app/src/main/java/com/alphawallet/app/ui/AddTokenActivity.java index deeb21aee1..cc1631caf5 100644 --- a/app/src/main/java/com/alphawallet/app/ui/AddTokenActivity.java +++ b/app/src/main/java/com/alphawallet/app/ui/AddTokenActivity.java @@ -9,7 +9,6 @@ import android.os.Bundle; import android.text.Editable; import android.text.TextWatcher; -import android.util.Log; import android.util.LongSparseArray; import android.view.Menu; import android.view.MenuItem; @@ -25,7 +24,6 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.alphawallet.app.BuildConfig; import com.alphawallet.app.C; import com.alphawallet.app.R; import com.alphawallet.app.entity.ContractLocator; @@ -39,7 +37,7 @@ import com.alphawallet.app.entity.tokens.TokenCardMeta; import com.alphawallet.app.repository.EthereumNetworkBase; import com.alphawallet.app.repository.EthereumNetworkRepository; -import com.alphawallet.app.ui.QRScanning.QRScanner; +import com.alphawallet.app.ui.QRScanning.QRScannerActivity; import com.alphawallet.app.ui.widget.TokensAdapterCallback; import com.alphawallet.app.ui.widget.adapter.TokensAdapter; import com.alphawallet.app.ui.widget.entity.AddressReadyCallback; @@ -58,7 +56,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.inject.Inject; import timber.log.Timber; import dagger.hilt.android.AndroidEntryPoint; @@ -441,7 +438,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { inputAddressView.setAddress(extracted_address); } break; - case QRScanner.DENY_PERMISSION: + case QRScannerActivity.DENY_PERMISSION: showCameraDenied(); break; default: diff --git a/app/src/main/java/com/alphawallet/app/ui/DappBrowserFragment.java b/app/src/main/java/com/alphawallet/app/ui/DappBrowserFragment.java index df3471244d..4f54e049f2 100644 --- a/app/src/main/java/com/alphawallet/app/ui/DappBrowserFragment.java +++ b/app/src/main/java/com/alphawallet/app/ui/DappBrowserFragment.java @@ -86,7 +86,7 @@ import com.alphawallet.app.repository.TokensRealmSource; import com.alphawallet.app.repository.entity.RealmToken; import com.alphawallet.app.service.WalletConnectService; -import com.alphawallet.app.ui.QRScanning.QRScanner; +import com.alphawallet.app.ui.QRScanning.QRScannerActivity; import com.alphawallet.app.ui.widget.OnDappHomeNavClickListener; import com.alphawallet.app.ui.widget.adapter.DappBrowserSuggestionsAdapter; import com.alphawallet.app.ui.widget.entity.ActionSheetCallback; @@ -671,7 +671,7 @@ public void comeIntoFocus() { if (viewModel != null) { - if (viewModel.getActiveNetwork() == null || activeNetwork.chainId != viewModel.getActiveNetwork().chainId) + if (viewModel.getActiveNetwork() == null || activeNetwork == null || activeNetwork.chainId != viewModel.getActiveNetwork().chainId) { viewModel.checkForNetworkChanges(); } @@ -1238,8 +1238,14 @@ public void onWalletAddEthereumChainObject(long callbackId, WalletAddEthereumCha { // show add custom chain dialog addCustomChainDialog = new AddEthereumChainPrompt(getContext(), chainObj, chainObject -> { - viewModel.addCustomChain(chainObject); - loadNewNetwork(chainObj.getChainId()); + if (viewModel.addCustomChain(chainObject)) + { + loadNewNetwork(chainObj.getChainId()); + } + else + { + displayError(R.string.error_invalid_url, 0); + } addCustomChainDialog.dismiss(); }); addCustomChainDialog.show(); @@ -1438,6 +1444,23 @@ private void txError(Throwable throwable) confirmationDialog.dismiss(); } + private void displayError(int title, int text) + { + if (resultDialog != null && resultDialog.isShowing()) resultDialog.dismiss(); + resultDialog = new AWalletAlertDialog(requireContext()); + resultDialog.setIcon(ERROR); + resultDialog.setTitle(title); + if (text != 0) resultDialog.setMessage(text); + resultDialog.setButtonText(R.string.button_ok); + resultDialog.setButtonListener(v -> { + resultDialog.dismiss(); + }); + resultDialog.show(); + + if (confirmationDialog != null && confirmationDialog.isShowing()) + confirmationDialog.dismiss(); + } + private void showWalletWatch() { if (resultDialog != null && resultDialog.isShowing()) resultDialog.dismiss(); @@ -1809,10 +1832,10 @@ public void handleQRCode(int resultCode, Intent data, FragmentMessenger messenge } } break; - case QRScanner.DENY_PERMISSION: + case QRScannerActivity.DENY_PERMISSION: showCameraDenied(); break; - case QRScanner.WALLET_CONNECT: + case QRScannerActivity.WALLET_CONNECT: return; default: break; diff --git a/app/src/main/java/com/alphawallet/app/ui/FunctionActivity.java b/app/src/main/java/com/alphawallet/app/ui/FunctionActivity.java index dc81d9688b..0a40fac2e0 100644 --- a/app/src/main/java/com/alphawallet/app/ui/FunctionActivity.java +++ b/app/src/main/java/com/alphawallet/app/ui/FunctionActivity.java @@ -127,7 +127,7 @@ private void initViews() { tokenView.setChainId(token.tokenInfo.chainId); tokenView.setWalletAddress(new Address(token.getWallet())); tokenView.setupWindowCallback(this); - tokenView.setRpcUrl(token.tokenInfo.chainId); + tokenView.setRpcUrl(viewModel.getBrowserRPC(token.tokenInfo.chainId)); tokenView.setOnReadyCallback(this); tokenView.setOnSignPersonalMessageListener(this); tokenView.setOnSetValuesListener(this); @@ -137,6 +137,7 @@ private void initViews() { parsePass = 0; ProgressBar loadSpinner = findViewById(R.id.ticket_load_spinner); + loadSpinner.setVisibility(View.VISIBLE); handler.postDelayed(() -> loadSpinner.setVisibility(View.GONE), 2500); } @@ -304,6 +305,7 @@ public boolean onOptionsItemSelected(MenuItem item) { private void completeTokenScriptFunction(String function) { Map functions = viewModel.getAssetDefinitionService().getTokenFunctionMap(token.tokenInfo.chainId, token.getAddress()); + if (functions == null) return; action = functions.get(function); if (action != null && action.function != null) //if no function then it's handled by the token view diff --git a/app/src/main/java/com/alphawallet/app/ui/HomeActivity.java b/app/src/main/java/com/alphawallet/app/ui/HomeActivity.java index 81e9fb3041..8d19e874f4 100644 --- a/app/src/main/java/com/alphawallet/app/ui/HomeActivity.java +++ b/app/src/main/java/com/alphawallet/app/ui/HomeActivity.java @@ -39,7 +39,6 @@ import androidx.annotation.Nullable; import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; -import androidx.core.content.FileProvider; import androidx.core.view.WindowCompat; import androidx.core.view.WindowInsetsCompat; import androidx.core.view.WindowInsetsControllerCompat; @@ -52,7 +51,6 @@ import androidx.viewpager2.adapter.FragmentStateAdapter; import androidx.viewpager2.widget.ViewPager2; -import com.alphawallet.app.BuildConfig; import com.alphawallet.app.C; import com.alphawallet.app.R; import com.alphawallet.app.api.v1.entity.request.ApiV1Request; @@ -87,7 +85,6 @@ import net.yslibrary.android.keyboardvisibilityevent.KeyboardVisibilityEvent; -import java.io.File; import java.lang.reflect.Method; import java.net.URLDecoder; import java.util.List; @@ -242,7 +239,6 @@ public void onPageScrollStateChanged(int state) dissableDisplayHomeAsUp(); viewModel.error().observe(this, this::onError); - viewModel.installIntent().observe(this, this::onInstallIntent); viewModel.walletName().observe(this, this::onWalletName); viewModel.backUpMessage().observe(this, this::onBackup); viewModel.splashReset().observe(this, this::onRequireInit); @@ -278,6 +274,7 @@ public void onPageScrollStateChanged(int state) else { //TODO: Check we are using latest version on github, since we're using a downloaded/manually installed version + //TODO: Also add a build exclusion so this code only appears if it's a noAnalytics build. //First check that this the package name is "io.stormbird.wallet" - it could be a fork } @@ -925,31 +922,6 @@ public void onRequestPermissionsResult(int requestCode, String[] permissions, in } } - private void onInstallIntent(File installFile) - { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) - { - String authority = BuildConfig.APPLICATION_ID + ".fileprovider"; - Uri apkUri = FileProvider.getUriForFile(getApplicationContext(), authority, installFile); - Intent intent = new Intent(Intent.ACTION_INSTALL_PACKAGE); - intent.setData(apkUri); - intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); - startActivity(intent); - } - else - { - Uri apkUri = Uri.fromFile(installFile); - Intent intent = new Intent(Intent.ACTION_VIEW); - intent.setDataAndType(apkUri, "application/vnd.android.package-archive"); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - startActivity(intent); - } - - //Blank install time here so that next time the app runs the install time will be correctly set up - viewModel.setInstallTime(0); - finish(); - } - @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { diff --git a/app/src/main/java/com/alphawallet/app/ui/ImportWalletActivity.java b/app/src/main/java/com/alphawallet/app/ui/ImportWalletActivity.java index 346ce9ac7e..e849cc451e 100644 --- a/app/src/main/java/com/alphawallet/app/ui/ImportWalletActivity.java +++ b/app/src/main/java/com/alphawallet/app/ui/ImportWalletActivity.java @@ -5,7 +5,6 @@ import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; -import android.util.Log; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -30,7 +29,7 @@ import com.alphawallet.app.entity.cryptokeys.KeyEncodingType; import com.alphawallet.app.repository.EthereumNetworkBase; import com.alphawallet.app.service.KeyService; -import com.alphawallet.app.ui.QRScanning.QRScanner; +import com.alphawallet.app.ui.QRScanning.QRScannerActivity; import com.alphawallet.app.ui.widget.OnImportKeystoreListener; import com.alphawallet.app.ui.widget.OnImportPrivateKeyListener; import com.alphawallet.app.ui.widget.OnImportSeedListener; @@ -56,8 +55,6 @@ import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; - import dagger.hilt.android.AndroidEntryPoint; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; @@ -283,7 +280,7 @@ public boolean onOptionsItemSelected(MenuItem item) { } else if (item.getItemId() == R.id.action_scan) { - Intent intent = new Intent(this, QRScanner.class); + Intent intent = new Intent(this, QRScannerActivity.class); getQRCode.launch(intent); } @@ -460,7 +457,7 @@ private void handleScanQR(int resultCode, Intent data) } } break; - case QRScanner.DENY_PERMISSION: + case QRScannerActivity.DENY_PERMISSION: showCameraDenied(); break; default: diff --git a/app/src/main/java/com/alphawallet/app/ui/NFTAssetDetailActivity.java b/app/src/main/java/com/alphawallet/app/ui/NFTAssetDetailActivity.java index ea55e0c0c0..a7750bbfcb 100644 --- a/app/src/main/java/com/alphawallet/app/ui/NFTAssetDetailActivity.java +++ b/app/src/main/java/com/alphawallet/app/ui/NFTAssetDetailActivity.java @@ -35,7 +35,6 @@ import com.alphawallet.app.service.GasService; import com.alphawallet.app.ui.widget.entity.ActionSheetCallback; import com.alphawallet.app.ui.widget.entity.NFTAttributeLayout; -import com.alphawallet.app.util.Utils; import com.alphawallet.app.viewmodel.TokenFunctionViewModel; import com.alphawallet.app.web3.entity.Web3Transaction; import com.alphawallet.app.widget.AWalletAlertDialog; @@ -90,6 +89,7 @@ public class NFTAssetDetailActivity extends BaseActivity implements StandardFunc private TokenInfoView tivLastSale; private TokenInfoView tivAveragePrice; private TokenInfoView tivFloorPrice; + private TokenInfoView tivRarityData; private Animation rotation; private ActivityResultLauncher handleTransactionSuccess; private ActivityResultLauncher getGasSettings; @@ -196,6 +196,7 @@ private void initViews() tivLastSale = findViewById(R.id.last_sale); tivAveragePrice = findViewById(R.id.average_price); tivFloorPrice = findViewById(R.id.floor_price); + tivRarityData = findViewById(R.id.rarity); rotation = AnimationUtils.loadAnimation(this, R.anim.rotate_refresh); rotation.setRepeatCount(Animation.INFINITE); @@ -308,7 +309,7 @@ private void updateDefaultTokenData() tivNetwork.setValue(token.getNetworkName()); - tivContractAddress.setValue(Utils.formatAddress(token.tokenInfo.address)); + tivContractAddress.setCopyableValue(token.tokenInfo.address); } private void loadAssetFromMetadata(NFTAsset asset) @@ -407,6 +408,11 @@ private void loadFromOpenSeaData(OpenSeaAsset openSeaAsset) nftAttributeLayout.bind(token, openSeaAsset.traits, 0); } + if (openSeaAsset.rarity != null && openSeaAsset.rarity.rank > 0) + { + tivRarityData.setValue("#" + openSeaAsset.rarity.rank); + } + if (openSeaAsset.owner != null && openSeaAsset.owner.user != null) { diff --git a/app/src/main/java/com/alphawallet/app/ui/NFTAssetsFragment.java b/app/src/main/java/com/alphawallet/app/ui/NFTAssetsFragment.java index 09b02fb5f7..112c53a7f5 100644 --- a/app/src/main/java/com/alphawallet/app/ui/NFTAssetsFragment.java +++ b/app/src/main/java/com/alphawallet/app/ui/NFTAssetsFragment.java @@ -169,7 +169,7 @@ private void initAndAttachAdapter(boolean isGridView) else { searchLayout.setVisibility(View.VISIBLE); - adapter = new NFTAssetsAdapter(getActivity(), token, this, isGridView); + adapter = new NFTAssetsAdapter(getActivity(), token, this, viewModel.getOpenseaService(), isGridView); search.addTextChangedListener(setupTextWatcher((NFTAssetsAdapter)adapter)); } diff --git a/app/src/main/java/com/alphawallet/app/ui/NewSettingsFragment.java b/app/src/main/java/com/alphawallet/app/ui/NewSettingsFragment.java index 0c9bcd4e3a..aca05ec7d1 100644 --- a/app/src/main/java/com/alphawallet/app/ui/NewSettingsFragment.java +++ b/app/src/main/java/com/alphawallet/app/ui/NewSettingsFragment.java @@ -43,6 +43,7 @@ import com.alphawallet.app.interact.GenericWalletInteract; import com.alphawallet.app.util.LocaleUtils; import com.alphawallet.app.util.UpdateUtils; +import com.alphawallet.app.util.Utils; import com.alphawallet.app.viewmodel.NewSettingsViewModel; import com.alphawallet.app.widget.NotificationView; import com.alphawallet.app.widget.SettingsItemView; @@ -175,7 +176,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c private void initNotificationView(View view) { notificationView = view.findViewById(R.id.notification); - if (android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) + if (android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.M && !viewModel.hasShownAPI23Notification()) { notificationView.setTitle(getContext().getString(R.string.title_version_support_warning)); notificationView.setMessage(getContext().getString(R.string.message_version_support_warning)); @@ -183,7 +184,7 @@ private void initNotificationView(View view) notificationView.setPrimaryButtonListener(() -> { notificationView.setVisibility(View.GONE); - viewModel.setMarshMallowWarning(true); + viewModel.cancelAPI23Notification(); }); } else @@ -412,14 +413,10 @@ private void onDefaultWallet(Wallet wallet) this.wallet = wallet; if (wallet.address != null) { - if (!wallet.ENSname.isEmpty()) - { - changeWalletSetting.setSubtitle(wallet.ENSname + " | " + wallet.address); - } - else - { - changeWalletSetting.setSubtitle(wallet.address); - } + String walletAddressDisplay = wallet.ENSname.isEmpty() ? wallet.address + : wallet.ENSname + " | " + Utils.formatAddress(wallet.address); + + changeWalletSetting.setSubtitle(walletAddressDisplay); } switch (wallet.authLevel) diff --git a/app/src/main/java/com/alphawallet/app/ui/QRScanning/QRScanner.java b/app/src/main/java/com/alphawallet/app/ui/QRScanning/QRScannerActivity.java similarity index 98% rename from app/src/main/java/com/alphawallet/app/ui/QRScanning/QRScanner.java rename to app/src/main/java/com/alphawallet/app/ui/QRScanning/QRScannerActivity.java index 259e2cc20d..de159dcfd0 100644 --- a/app/src/main/java/com/alphawallet/app/ui/QRScanning/QRScanner.java +++ b/app/src/main/java/com/alphawallet/app/ui/QRScanning/QRScannerActivity.java @@ -1,5 +1,10 @@ package com.alphawallet.app.ui.QRScanning; +import static android.Manifest.permission.READ_EXTERNAL_STORAGE; +import static android.os.Build.VERSION.SDK_INT; +import static androidx.core.view.WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE; +import static com.alphawallet.app.repository.SharedPreferenceRepository.FULL_SCREEN_STATE; + import android.Manifest; import android.app.Activity; import android.content.Intent; @@ -55,15 +60,10 @@ import io.reactivex.schedulers.Schedulers; import timber.log.Timber; -import static android.Manifest.permission.READ_EXTERNAL_STORAGE; -import static android.os.Build.VERSION.SDK_INT; -import static androidx.core.view.WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE; -import static com.alphawallet.app.repository.SharedPreferenceRepository.FULL_SCREEN_STATE; - /** * Created by JB on 12/09/2021. */ -public class QRScanner extends BaseActivity +public class QRScannerActivity extends BaseActivity { private DecoratedBarcodeView barcodeView; private BeepManager beepManager; @@ -374,7 +374,12 @@ public void onBackPressed() } @Override - public boolean onKeyDown(int keyCode, KeyEvent event) { + public boolean onKeyDown(int keyCode, KeyEvent event) + { + if (barcodeView == null) + { + return false; + } return barcodeView.onKeyDown(keyCode, event) || super.onKeyDown(keyCode, event); } diff --git a/app/src/main/java/com/alphawallet/app/ui/SelectRouteActivity.java b/app/src/main/java/com/alphawallet/app/ui/SelectRouteActivity.java new file mode 100644 index 0000000000..c29c1bfed2 --- /dev/null +++ b/app/src/main/java/com/alphawallet/app/ui/SelectRouteActivity.java @@ -0,0 +1,201 @@ +package com.alphawallet.app.ui; + +import android.content.Intent; +import android.os.Bundle; +import android.os.CountDownTimer; +import android.view.View; +import android.widget.LinearLayout; +import android.widget.TextView; + +import androidx.annotation.Nullable; +import androidx.lifecycle.ViewModelProvider; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.alphawallet.app.R; +import com.alphawallet.app.entity.lifi.Route; +import com.alphawallet.app.ui.widget.adapter.RouteAdapter; +import com.alphawallet.app.ui.widget.entity.ProgressInfo; +import com.alphawallet.app.util.BalanceUtils; +import com.alphawallet.app.util.SwapUtils; +import com.alphawallet.app.viewmodel.SelectRouteViewModel; +import com.alphawallet.app.widget.AWalletAlertDialog; +import com.alphawallet.app.widget.AddressIcon; +import com.google.android.material.button.MaterialButton; + +import java.util.List; +import java.util.Locale; + +import dagger.hilt.android.AndroidEntryPoint; + +@AndroidEntryPoint +public class SelectRouteActivity extends BaseActivity +{ + private static final long GET_ROUTES_INTERVAL_MS = 30000; + private static final long COUNTDOWN_INTERVAL_MS = 1000; + private SelectRouteViewModel viewModel; + private RecyclerView recyclerView; + private TextView fromAmount; + private TextView fromSymbol; + private TextView currentPrice; + private TextView countdownText; + private LinearLayout noRoutesLayout; + private MaterialButton selectExchangesBtn; + private AddressIcon fromTokenIcon; + private AWalletAlertDialog progressDialog; + private CountDownTimer getRoutesTimer; + + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) + { + super.onCreate(savedInstanceState); + + setContentView(R.layout.activity_select_route); + + toolbar(); + + setTitle(getString(R.string.title_select_route)); + + initViews(); + + initViewModel(); + + initTimer(); + } + + @Override + protected void onResume() + { + getRoutes(); + super.onResume(); + } + + @Override + protected void onPause() + { + if (getRoutesTimer != null) + { + getRoutesTimer.cancel(); + } + super.onPause(); + } + + private void initViews() + { + recyclerView = findViewById(R.id.list_routes); + fromAmount = findViewById(R.id.from_amount); + fromSymbol = findViewById(R.id.from_symbol); + fromTokenIcon = findViewById(R.id.from_token_icon); + currentPrice = findViewById(R.id.current_price); + countdownText = findViewById(R.id.text_countdown); + noRoutesLayout = findViewById(R.id.layout_no_routes_found); + selectExchangesBtn = findViewById(R.id.btn_select_exchanges); + selectExchangesBtn.setOnClickListener(v -> { + Intent intent = new Intent(this, SelectSwapProvidersActivity.class); + startActivity(intent); + }); + + progressDialog = new AWalletAlertDialog(this); + progressDialog.setCancelable(false); + progressDialog.setProgressMode(); + } + + private void initViewModel() + { + viewModel = new ViewModelProvider(this) + .get(SelectRouteViewModel.class); + viewModel.routes().observe(this, this::onRoutes); + viewModel.progressInfo().observe(this, this::onProgressInfo); + } + + private void initTimer() + { + getRoutesTimer = new CountDownTimer(GET_ROUTES_INTERVAL_MS, COUNTDOWN_INTERVAL_MS) + { + @Override + public void onTick(long millisUntilFinished) + { + String format = millisUntilFinished < 10000 ? "0:0%d" : "0:%d"; + String time = String.format(Locale.ENGLISH, format, millisUntilFinished / 1000); + countdownText.setText(getString(R.string.label_available_routes, time)); + } + + @Override + public void onFinish() + { + getRoutes(); + } + }; + } + + private void getRoutes() + { + String fromChainId = getIntent().getStringExtra("fromChainId"); + String toChainId = getIntent().getStringExtra("toChainId"); + String fromTokenAddress = getIntent().getStringExtra("fromTokenAddress"); + String toTokenAddress = getIntent().getStringExtra("toTokenAddress"); + String fromAddress = getIntent().getStringExtra("fromAddress"); + String fromAmount = getIntent().getStringExtra("fromAmount"); + long fromTokenDecimals = getIntent().getLongExtra("fromTokenDecimals", -1); + String slippage = getIntent().getStringExtra("slippage"); + String fromSymbol = getIntent().getStringExtra("fromTokenSymbol"); + String fromTokenLogoUri = getIntent().getStringExtra("fromTokenLogoUri"); + + this.fromAmount.setText(BalanceUtils.getShortFormat(fromAmount, fromTokenDecimals)); + this.fromSymbol.setText(fromSymbol); + this.fromTokenIcon.bindData(fromTokenLogoUri, Long.parseLong(fromChainId), fromTokenAddress, fromSymbol); + + viewModel.getRoutes(fromChainId, toChainId, fromTokenAddress, toTokenAddress, fromAddress, fromAmount, slippage, viewModel.getPreferredExchanges()); + } + + private void onRoutes(List routes) + { + processRoutes(routes); + + getRoutesTimer.start(); + } + + private void processRoutes(List routeList) + { + RouteAdapter adapter = new RouteAdapter(this, routeList, provider -> { + Intent intent = new Intent(); + intent.putExtra("provider", provider); + setResult(RESULT_OK, intent); + finish(); + }); + recyclerView.setLayoutManager(new LinearLayoutManager(this)); + recyclerView.setAdapter(adapter); + + if (!routeList.isEmpty()) + { + Route route = routeList.get(0); + currentPrice.setText(SwapUtils.getFormattedCurrentPrice(route.steps.get(0).action)); + noRoutesLayout.setVisibility(View.GONE); + } + else + { + currentPrice.setText(R.string.NA); + noRoutesLayout.setVisibility(View.VISIBLE); + } + } + + private void onProgressInfo(ProgressInfo progressInfo) + { + if (progressInfo.shouldShow()) + { + progressDialog.setMessage(progressInfo.getMessage()); + progressDialog.show(); + } + else + { + progressDialog.dismiss(); + } + } + + @Override + public void onBackPressed() + { + setResult(RESULT_CANCELED); + super.onBackPressed(); + } +} diff --git a/app/src/main/java/com/alphawallet/app/ui/SelectSwapProvidersActivity.java b/app/src/main/java/com/alphawallet/app/ui/SelectSwapProvidersActivity.java new file mode 100644 index 0000000000..c70087e814 --- /dev/null +++ b/app/src/main/java/com/alphawallet/app/ui/SelectSwapProvidersActivity.java @@ -0,0 +1,78 @@ +package com.alphawallet.app.ui; + +import android.os.Bundle; +import android.view.MenuItem; +import android.widget.Toast; + +import androidx.annotation.Nullable; +import androidx.lifecycle.ViewModelProvider; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.alphawallet.app.R; +import com.alphawallet.app.ui.widget.adapter.SwapProviderAdapter; +import com.alphawallet.app.viewmodel.SelectSwapProvidersViewModel; + +import dagger.hilt.android.AndroidEntryPoint; + +@AndroidEntryPoint +public class SelectSwapProvidersActivity extends BaseActivity +{ + private SelectSwapProvidersViewModel viewModel; + private SwapProviderAdapter adapter; + + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) + { + super.onCreate(savedInstanceState); + + setContentView(R.layout.basic_list_activity); + + toolbar(); + + setTitle(getString(R.string.title_select_exchanges)); + + initViewModel(); + + initViews(); + } + + private void initViewModel() + { + viewModel = new ViewModelProvider(this) + .get(SelectSwapProvidersViewModel.class); + } + + private void initViews() + { + RecyclerView recyclerView = findViewById(R.id.list); + recyclerView.setLayoutManager(new LinearLayoutManager(this)); + adapter = new SwapProviderAdapter(viewModel.getSwapProviders()); + recyclerView.setAdapter(adapter); + } + + @Override + public void onBackPressed() + { + if (viewModel.savePreferences(adapter.getExchanges())) + { + setResult(RESULT_OK); + super.onBackPressed(); + } + else + { + Toast.makeText(this, getString(R.string.message_select_one_exchange), Toast.LENGTH_SHORT).show(); + } + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) + { + if (item.getItemId() == android.R.id.home) + { + onBackPressed(); + return true; + } + return super.onOptionsItemSelected(item); + } +} diff --git a/app/src/main/java/com/alphawallet/app/ui/SendActivity.java b/app/src/main/java/com/alphawallet/app/ui/SendActivity.java index 13b18bf069..aaf7e99b66 100644 --- a/app/src/main/java/com/alphawallet/app/ui/SendActivity.java +++ b/app/src/main/java/com/alphawallet/app/ui/SendActivity.java @@ -35,7 +35,7 @@ import com.alphawallet.app.repository.EthereumNetworkBase; import com.alphawallet.app.repository.EthereumNetworkRepository; import com.alphawallet.app.service.GasService; -import com.alphawallet.app.ui.QRScanning.QRScanner; +import com.alphawallet.app.ui.QRScanning.QRScannerActivity; import com.alphawallet.app.ui.widget.entity.ActionSheetCallback; import com.alphawallet.app.ui.widget.entity.AddressReadyCallback; import com.alphawallet.app.ui.widget.entity.AmountReadyCallback; @@ -279,7 +279,7 @@ else if (qrCode.startsWith("wc:")) } } break; - case QRScanner.DENY_PERMISSION: + case QRScannerActivity.DENY_PERMISSION: showCameraDenied(); break; default: diff --git a/app/src/main/java/com/alphawallet/app/ui/SwapActivity.java b/app/src/main/java/com/alphawallet/app/ui/SwapActivity.java index f066cee50b..1a85fbf111 100644 --- a/app/src/main/java/com/alphawallet/app/ui/SwapActivity.java +++ b/app/src/main/java/com/alphawallet/app/ui/SwapActivity.java @@ -2,7 +2,7 @@ import android.content.Intent; import android.os.Bundle; -import android.os.Handler; +import android.os.CountDownTimer; import android.text.TextUtils; import android.view.Menu; import android.view.MenuItem; @@ -12,6 +12,7 @@ import android.widget.TextView; import androidx.activity.result.ActivityResultLauncher; +import androidx.activity.result.contract.ActivityResultContracts; import androidx.annotation.Nullable; import androidx.lifecycle.ViewModelProvider; @@ -25,8 +26,9 @@ import com.alphawallet.app.entity.lifi.Chain; import com.alphawallet.app.entity.lifi.Connection; import com.alphawallet.app.entity.lifi.Quote; -import com.alphawallet.app.entity.tokens.Token; +import com.alphawallet.app.entity.lifi.Token; import com.alphawallet.app.ui.widget.entity.ActionSheetCallback; +import com.alphawallet.app.ui.widget.entity.ProgressInfo; import com.alphawallet.app.util.BalanceUtils; import com.alphawallet.app.util.SwapUtils; import com.alphawallet.app.viewmodel.SwapViewModel; @@ -35,6 +37,7 @@ import com.alphawallet.app.widget.AWalletAlertDialog; import com.alphawallet.app.widget.ActionSheetDialog; import com.alphawallet.app.widget.SelectTokenDialog; +import com.alphawallet.app.widget.StandardHeader; import com.alphawallet.app.widget.SwapSettingsDialog; import com.alphawallet.app.widget.TokenInfoView; import com.alphawallet.app.widget.TokenSelector; @@ -51,6 +54,7 @@ public class SwapActivity extends BaseActivity implements StandardFunctionInterface, ActionSheetCallback { private static final long GET_QUOTE_INTERVAL_MS = 30000; + private static final long COUNTDOWN_INTERVAL_MS = 1000; private SwapViewModel viewModel; private TokenSelector sourceSelector; private TokenSelector destSelector; @@ -62,39 +66,26 @@ public class SwapActivity extends BaseActivity implements StandardFunctionInterf private AWalletAlertDialog errorDialog; private RelativeLayout tokenLayout; private LinearLayout infoLayout; + private StandardHeader quoteHeader; private TokenInfoView provider; - private TokenInfoView fees; + private TokenInfoView providerWebsite; + private TokenInfoView gasFees; + private TokenInfoView otherFees; private TokenInfoView currentPrice; private TokenInfoView minReceived; private LinearLayout noConnectionsLayout; private MaterialButton continueBtn; private MaterialButton openSettingsBtn; private TextView chainName; - private Token token; + private com.alphawallet.app.entity.tokens.Token token; private Wallet wallet; - private Connection.LToken sourceToken; + private Token sourceToken; private List chains; - private final Handler getQuoteHandler = new Handler(); - private final Runnable getQuoteRunnable = new Runnable() - { - @Override - public void run() - { - if (confirmationDialog == null || !confirmationDialog.isShowing()) - { - viewModel.getQuote( - sourceSelector.getToken(), - destSelector.getToken(), - wallet.address, - sourceSelector.getAmount(), - settingsDialog.getSlippage()); - } - else - { - startQuoteTask(GET_QUOTE_INTERVAL_MS); - } - } - }; + private String selectedRouteProvider; + private CountDownTimer getQuoteTimer; + private ActivityResultLauncher selectSwapProviderLauncher; + private ActivityResultLauncher gasSettingsLauncher; + private ActivityResultLauncher getRoutesLauncher; @Override protected void onCreate(@Nullable Bundle savedInstanceState) @@ -113,7 +104,42 @@ protected void onCreate(@Nullable Bundle savedInstanceState) initViews(); - viewModel.getChains(); + initTimer(); + + registerActivityResultLaunchers(); + + viewModel.prepare(this, selectSwapProviderLauncher); + } + + private void registerActivityResultLaunchers() + { + selectSwapProviderLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), + result -> { + if (result.getResultCode() == RESULT_OK) + { + viewModel.getChains(); + } + }); + + gasSettingsLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), + result -> confirmationDialog.setCurrentGasIndex(result)); + + getRoutesLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), + result -> { + if (result.getResultCode() == RESULT_OK) + { + Intent data = result.getData(); + if (data != null) + { + selectedRouteProvider = data.getStringExtra("provider"); + getQuote(); + } + } + else if (result.getResultCode() == RESULT_CANCELED) + { + continueBtn.setEnabled(!TextUtils.isEmpty(selectedRouteProvider)); + } + }); } private void initViewModel() @@ -131,6 +157,24 @@ private void initViewModel() viewModel.transactionError().observe(this, this::txError); } + private void initTimer() + { + getQuoteTimer = new CountDownTimer(GET_QUOTE_INTERVAL_MS, COUNTDOWN_INTERVAL_MS) + { + @Override + public void onTick(long millisUntilFinished) + { + // TODO: Display countdown timer? + } + + @Override + public void onFinish() + { + getQuote(); + } + }; + } + private void getIntentData() { long chainId = getIntent().getLongExtra(C.EXTRA_CHAIN_ID, EthereumNetworkBase.MAINNET_ID); @@ -145,14 +189,21 @@ private void initViews() destSelector = findViewById(R.id.to_input); tokenLayout = findViewById(R.id.layout_tokens); infoLayout = findViewById(R.id.layout_info); + quoteHeader = findViewById(R.id.header_quote); provider = findViewById(R.id.tiv_provider); - fees = findViewById(R.id.tiv_fees); + providerWebsite = findViewById(R.id.tiv_provider_website); + gasFees = findViewById(R.id.tiv_gas_fees); + otherFees = findViewById(R.id.tiv_other_fees); currentPrice = findViewById(R.id.tiv_current_price); minReceived = findViewById(R.id.tiv_min_received); noConnectionsLayout = findViewById(R.id.layout_no_connections); continueBtn = findViewById(R.id.btn_continue); openSettingsBtn = findViewById(R.id.btn_open_settings); + quoteHeader.getImageControl().setOnClickListener(v -> { + getAvailableRoutes(); + }); + progressDialog = new AWalletAlertDialog(this); progressDialog.setCancelable(false); progressDialog.setProgressMode(); @@ -186,11 +237,11 @@ public void onSelectorClicked() @Override public void onAmountChanged(String amount) { - startQuoteTask(0); + getAvailableRoutes(); } @Override - public void onSelectionChanged(Connection.LToken token) + public void onSelectionChanged(Token token) { sourceTokenChanged(token); } @@ -198,7 +249,13 @@ public void onSelectionChanged(Connection.LToken token) @Override public void onMaxClicked() { - String max = viewModel.getBalance(sourceSelector.getToken()); + Token token = sourceSelector.getToken(); + if (token == null) + { + return; + } + + String max = viewModel.getBalance(token); if (!max.isEmpty()) { sourceSelector.setAmount(max); @@ -221,7 +278,7 @@ public void onAmountChanged(String amount) } @Override - public void onSelectionChanged(Connection.LToken token) + public void onSelectionChanged(Token token) { destTokenChanged(token); } @@ -248,11 +305,11 @@ private ActionSheetDialog createConfirmationAction(Quote quote) ActionSheetDialog confDialog = null; try { - Token activeToken = viewModel.getTokensService().getTokenOrBase(sourceToken.chainId, sourceToken.address); + com.alphawallet.app.entity.tokens.Token activeToken = viewModel.getTokensService().getTokenOrBase(sourceToken.chainId, sourceToken.address); Web3Transaction w3Tx = viewModel.buildWeb3Transaction(quote); confDialog = new ActionSheetDialog(this, w3Tx, activeToken, "", w3Tx.recipient.toString(), viewModel.getTokensService(), this); - confDialog.setURL(quote.toolDetails.name); + confDialog.setURL(quote.swapProvider.name); confDialog.setCanceledOnTouchOutside(false); confDialog.setGasEstimate(Numeric.toBigInt(quote.transactionRequest.gasLimit)); } @@ -264,7 +321,7 @@ private ActionSheetDialog createConfirmationAction(Quote quote) return confDialog; } - private void destTokenChanged(Connection.LToken token) + private void destTokenChanged(Token token) { destSelector.setBalance(viewModel.getBalance(token)); @@ -272,10 +329,10 @@ private void destTokenChanged(Connection.LToken token) destTokenDialog.setSelectedToken(token.address); - startQuoteTask(0); + getAvailableRoutes(); } - private void sourceTokenChanged(Connection.LToken token) + private void sourceTokenChanged(Token token) { if (destSelector.getToken() == null) { @@ -294,17 +351,31 @@ private void sourceTokenChanged(Connection.LToken token) sourceToken = token; - startQuoteTask(0); + getAvailableRoutes(); } @Override protected void onResume() { super.onResume(); + if (settingsDialog != null) + { + settingsDialog.setSwapProviders(viewModel.getPreferredSwapProviders()); + } + } + + @Override + protected void onPause() + { + if (getQuoteTimer != null) + { + getQuoteTimer.cancel(); + } + super.onPause(); } // The source token should default to the token selected in the main wallet dialog (ie the token from the intent). - private void initSourceToken(Connection.LToken selectedToken) + private void initSourceToken(Token selectedToken) { if (selectedToken != null) { @@ -318,7 +389,7 @@ private void initSourceToken(Connection.LToken selectedToken) } } - private void initFromDialog(List fromTokens) + private void initFromDialog(List fromTokens) { Tokens.sortValue(fromTokens); sourceTokenDialog = new SelectTokenDialog(fromTokens, this, tokenItem -> { @@ -327,7 +398,7 @@ private void initFromDialog(List fromTokens) }); } - private void initToDialog(List toTokens) + private void initToDialog(List toTokens) { Tokens.sortName(toTokens); Tokens.sortValue(toTokens); @@ -337,30 +408,39 @@ private void initToDialog(List toTokens) }); } - private void startQuoteTask(long delay) + private void getAvailableRoutes() { - stopQuoteTask(); - - continueBtn.setEnabled(false); + if (getQuoteTimer != null) + { + getQuoteTimer.cancel(); + } if (sourceSelector.getToken() != null && destSelector.getToken() != null + && !sourceSelector.getToken().equals(destSelector.getToken()) && !TextUtils.isEmpty(sourceSelector.getAmount())) { - getQuoteHandler.postDelayed(getQuoteRunnable, delay); + viewModel.getRoutes( + this, + getRoutesLauncher, + sourceSelector.getToken(), + destSelector.getToken(), + wallet.address, + sourceSelector.getAmount(), + settingsDialog.getSlippage() + ); } } - private void stopQuoteTask() - { - getQuoteHandler.removeCallbacks(getQuoteRunnable); - } - private void onChains(List chains) { this.chains = chains; - settingsDialog = new SwapSettingsDialog(this, chains, + settingsDialog = new SwapSettingsDialog( + this, + chains, + viewModel.getSwapProviders(), + viewModel.getPreferredSwapProviders(), chain -> { chainName.setText(chain.name); viewModel.setChain(chain); @@ -400,13 +480,13 @@ private void onConnections(List connections) { if (!connections.isEmpty()) { - List fromTokens = new ArrayList<>(); - List toTokens = new ArrayList<>(); - Connection.LToken selectedToken = null; + List fromTokens = new ArrayList<>(); + List toTokens = new ArrayList<>(); + Token selectedToken = null; for (Connection c : connections) { - for (Connection.LToken t : c.fromTokens) + for (Token t : c.fromTokens) { if (!fromTokens.contains(t)) { @@ -417,7 +497,7 @@ private void onConnections(List connections) { fromTokens.add(t); - if (t.chainId == token.tokenInfo.chainId && t.address.equalsIgnoreCase(token.getAddress())) + if (t.isSimilarTo(token, wallet.address)) { selectedToken = t; } @@ -425,7 +505,7 @@ private void onConnections(List connections) } } - for (Connection.LToken t : c.toTokens) + for (Token t : c.toTokens) { if (!toTokens.contains(t)) { @@ -451,7 +531,21 @@ private void onConnections(List connections) infoLayout.setVisibility(View.GONE); noConnectionsLayout.setVisibility(View.VISIBLE); } + } + private void getQuote() + { + if (!TextUtils.isEmpty(selectedRouteProvider)) + { + viewModel.getQuote( + sourceSelector.getToken(), + destSelector.getToken(), + wallet.address, + sourceSelector.getAmount(), + settingsDialog.getSlippage(), + selectedRouteProvider + ); + } } private void onQuote(Quote quote) @@ -467,7 +561,7 @@ private void onQuote(Quote quote) continueBtn.setEnabled(true); - getQuoteHandler.postDelayed(getQuoteRunnable, GET_QUOTE_INTERVAL_MS); + getQuoteTimer.start(); } private void updateDestAmount(Quote quote) @@ -484,32 +578,31 @@ private void updateDestAmount(Quote quote) private void updateInfoSummary(Quote quote) { - provider.setValue(quote.toolDetails.name); - fees.setValue(SwapUtils.getTotalGasFees(quote.estimate.gasCosts)); - currentPrice.setValue(SwapUtils.getFormattedCurrentPrice(quote).trim()); - minReceived.setValue(SwapUtils.getMinimumAmountReceived(quote)); + provider.setValue(quote.swapProvider.name); + String url = viewModel.getSwapProviderUrl(quote.swapProvider.key); + if (!TextUtils.isEmpty(url)) + { + providerWebsite.setValue(url); + providerWebsite.setLink(); + } + gasFees.setValue(SwapUtils.getTotalGasFees(quote.estimate.gasCosts)); + otherFees.setValue(SwapUtils.getOtherFees(quote.estimate.feeCosts)); + currentPrice.setValue(SwapUtils.getFormattedCurrentPrice(quote.action).trim()); + minReceived.setValue(SwapUtils.getFormattedMinAmount(quote.estimate, quote.action)); infoLayout.setVisibility(View.VISIBLE); } - private void onProgressInfo(int code) + private void onProgressInfo(ProgressInfo progressInfo) { - String message; - switch (code) + if (progressInfo.shouldShow()) { - case C.ProgressInfo.FETCHING_CHAINS: - message = getString(R.string.message_fetching_chains); - break; - case C.ProgressInfo.FETCHING_CONNECTIONS: - message = getString(R.string.message_fetching_connections); - break; - case C.ProgressInfo.FETCHING_QUOTE: - message = getString(R.string.message_fetching_quote); - break; - default: - message = getString(R.string.title_dialog_handling); - break; + progressDialog.setTitle(progressInfo.getMessage()); + progressDialog.show(); + } + else + { + progressDialog.dismiss(); } - progressDialog.setTitle(message); } private void onProgress(Boolean shouldShowProgress) @@ -548,7 +641,7 @@ private void onError(ErrorEnvelope errorEnvelope) sourceSelector.setError(getString(R.string.error_insufficient_balance, sourceSelector.getToken().symbol)); break; case C.ErrorCode.SWAP_TIMEOUT_ERROR: - startQuoteTask(0); + getAvailableRoutes(); break; case C.ErrorCode.SWAP_CONNECTIONS_ERROR: case C.ErrorCode.SWAP_CHAIN_ERROR: @@ -567,7 +660,7 @@ private void onError(ErrorEnvelope errorEnvelope) errorDialog.setTitle(R.string.title_dialog_error); errorDialog.setMessage(errorEnvelope.message); errorDialog.setButton(R.string.try_again, v -> { - startQuoteTask(0); + getAvailableRoutes(); errorDialog.dismiss(); }); errorDialog.setSecondaryButton(R.string.action_cancel, v -> errorDialog.dismiss()); @@ -630,6 +723,6 @@ public void notifyConfirm(String mode) @Override public ActivityResultLauncher gasSelectLauncher() { - return null; + return gasSettingsLauncher; } } diff --git a/app/src/main/java/com/alphawallet/app/ui/TokenActivity.java b/app/src/main/java/com/alphawallet/app/ui/TokenActivity.java index 2824943515..4024f8e64b 100644 --- a/app/src/main/java/com/alphawallet/app/ui/TokenActivity.java +++ b/app/src/main/java/com/alphawallet/app/ui/TokenActivity.java @@ -552,7 +552,7 @@ private void populateActivityInfo(RealmAuxData item, String transactionValue) tokenView.setChainId(token.tokenInfo.chainId); tokenView.setWalletAddress(new Address(token.getWallet())); - tokenView.setRpcUrl(token.tokenInfo.chainId); + tokenView.setRpcUrl(viewModel.getBrowserRPC(token.tokenInfo.chainId)); tokenView.setOnReadyCallback(this); tokenView.setOnSetValuesListener(this); tokenView.setKeyboardListenerCallback(this); diff --git a/app/src/main/java/com/alphawallet/app/ui/TransferNFTActivity.java b/app/src/main/java/com/alphawallet/app/ui/TransferNFTActivity.java index 8d72636e54..47fea80263 100644 --- a/app/src/main/java/com/alphawallet/app/ui/TransferNFTActivity.java +++ b/app/src/main/java/com/alphawallet/app/ui/TransferNFTActivity.java @@ -33,7 +33,7 @@ import com.alphawallet.app.entity.tokens.Token; import com.alphawallet.app.repository.EthereumNetworkBase; import com.alphawallet.app.service.GasService; -import com.alphawallet.app.ui.QRScanning.QRScanner; +import com.alphawallet.app.ui.QRScanning.QRScannerActivity; import com.alphawallet.app.ui.widget.TokensAdapterCallback; import com.alphawallet.app.ui.widget.adapter.NonFungibleTokenAdapter; import com.alphawallet.app.ui.widget.entity.ActionSheetCallback; @@ -256,7 +256,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) addressInput.setAddress(extracted_address); } break; - case QRScanner.DENY_PERMISSION: + case QRScannerActivity.DENY_PERMISSION: showCameraDenied(); break; default: diff --git a/app/src/main/java/com/alphawallet/app/ui/TransferTicketDetailActivity.java b/app/src/main/java/com/alphawallet/app/ui/TransferTicketDetailActivity.java index bd868600ce..f5a5cf7e19 100644 --- a/app/src/main/java/com/alphawallet/app/ui/TransferTicketDetailActivity.java +++ b/app/src/main/java/com/alphawallet/app/ui/TransferTicketDetailActivity.java @@ -20,7 +20,6 @@ import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; -import android.util.Log; import android.view.View; import android.view.WindowManager; import android.widget.EditText; @@ -50,7 +49,7 @@ import com.alphawallet.app.entity.tokens.Token; import com.alphawallet.app.repository.EthereumNetworkBase; import com.alphawallet.app.service.GasService; -import com.alphawallet.app.ui.QRScanning.QRScanner; +import com.alphawallet.app.ui.QRScanning.QRScannerActivity; import com.alphawallet.app.ui.widget.TokensAdapterCallback; import com.alphawallet.app.ui.widget.adapter.NonFungibleTokenAdapter; import com.alphawallet.app.ui.widget.entity.ActionSheetCallback; @@ -72,7 +71,6 @@ import com.alphawallet.token.tools.Numeric; import org.jetbrains.annotations.NotNull; -import org.web3j.protocol.core.methods.response.EthEstimateGas; import java.math.BigDecimal; import java.math.BigInteger; @@ -85,8 +83,6 @@ import java.util.List; import java.util.Locale; -import javax.inject.Inject; - import dagger.hilt.android.AndroidEntryPoint; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.Disposable; @@ -571,7 +567,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) addressInput.setAddress(extracted_address); } break; - case QRScanner.DENY_PERMISSION: + case QRScannerActivity.DENY_PERMISSION: showCameraDenied(); break; default: diff --git a/app/src/main/java/com/alphawallet/app/ui/WalletActionsActivity.java b/app/src/main/java/com/alphawallet/app/ui/WalletActionsActivity.java index 17fa5680a5..c337f854f4 100644 --- a/app/src/main/java/com/alphawallet/app/ui/WalletActionsActivity.java +++ b/app/src/main/java/com/alphawallet/app/ui/WalletActionsActivity.java @@ -286,7 +286,10 @@ private void confirmDelete(Wallet wallet) { result -> { if (result.getResultCode() == RESULT_OK) { - successOverlay.setVisibility(View.VISIBLE); + if (successOverlay != null) + { + successOverlay.setVisibility(View.VISIBLE); + } handler.postDelayed(this, 1000); backupSuccessful(); finish(); diff --git a/app/src/main/java/com/alphawallet/app/ui/WalletConnectSessionActivity.java b/app/src/main/java/com/alphawallet/app/ui/WalletConnectSessionActivity.java index f38c533eaa..0f5de54b0e 100644 --- a/app/src/main/java/com/alphawallet/app/ui/WalletConnectSessionActivity.java +++ b/app/src/main/java/com/alphawallet/app/ui/WalletConnectSessionActivity.java @@ -32,7 +32,7 @@ import com.alphawallet.app.entity.Wallet; import com.alphawallet.app.entity.walletconnect.WalletConnectSessionItem; import com.alphawallet.app.repository.EthereumNetworkRepository; -import com.alphawallet.app.ui.QRScanning.QRScanner; +import com.alphawallet.app.ui.QRScanning.QRScannerActivity; import com.alphawallet.app.viewmodel.WalletConnectViewModel; import com.alphawallet.app.widget.AWalletAlertDialog; import com.bumptech.glide.Glide; @@ -50,7 +50,7 @@ public class WalletConnectSessionActivity extends BaseActivity { private final Handler handler = new Handler(Looper.getMainLooper()); - private final LocalBroadcastManager broadcastManager; + private LocalBroadcastManager broadcastManager; WalletConnectViewModel viewModel; private RecyclerView recyclerView; private Button btnConnectWallet; @@ -73,11 +73,6 @@ public void onReceive(Context context, Intent intent) } }; - public WalletConnectSessionActivity() - { - broadcastManager = LocalBroadcastManager.getInstance(this); - } - @Override protected void onCreate(@Nullable Bundle savedInstanceState) { @@ -102,6 +97,11 @@ private void initViewModel() .get(WalletConnectViewModel.class); viewModel.serviceReady().observe(this, this::onServiceReady); } + + if (broadcastManager == null) + { + broadcastManager = LocalBroadcastManager.getInstance(getApplicationContext()); + } } private void onServiceReady(Boolean aBoolean) @@ -117,13 +117,6 @@ private void onServiceReady(Boolean aBoolean) } } - @Override - public void onPause() - { - super.onPause(); - stopConnectionCheck(); - } - private void setupList() { wcSessions = viewModel.getSessions(); @@ -165,6 +158,13 @@ public void onResume() startConnectionCheck(); } + @Override + public void onPause() + { + super.onPause(); + stopConnectionCheck(); + } + @Override public boolean onCreateOptionsMenu(Menu menu) { @@ -194,7 +194,7 @@ else if (item.getItemId() == R.id.action_delete) private void openQrScanner() { - Intent intent = new Intent(this, QRScanner.class); + Intent intent = new Intent(this, QRScannerActivity.class); intent.putExtra("wallet", wallet); intent.putExtra(C.EXTRA_UNIVERSAL_SCAN, true); startActivity(intent); diff --git a/app/src/main/java/com/alphawallet/app/ui/WalletFragment.java b/app/src/main/java/com/alphawallet/app/ui/WalletFragment.java index 9d9f946406..903b1bb3e5 100644 --- a/app/src/main/java/com/alphawallet/app/ui/WalletFragment.java +++ b/app/src/main/java/com/alphawallet/app/ui/WalletFragment.java @@ -757,7 +757,7 @@ public boolean onMenuItemClick(MenuItem menuItem) { if (menuItem.getItemId() == R.id.action_my_wallet) { - viewModel.showMyAddress(getContext()); + viewModel.showMyAddress(requireContext()); } if (menuItem.getItemId() == R.id.action_scan) { @@ -769,13 +769,12 @@ public boolean onMenuItemClick(MenuItem menuItem) private void initNotificationView(View view) { NotificationView notificationView = view.findViewById(R.id.notification); - boolean hasShownWarning = viewModel.isMarshMallowWarningShown(); - if (!hasShownWarning && android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) + if (!viewModel.isMarshMallowWarningShown() && android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) { - notificationView.setTitle(getContext().getString(R.string.title_version_support_warning)); - notificationView.setMessage(getContext().getString(R.string.message_version_support_warning)); - notificationView.setPrimaryButtonText(getContext().getString(R.string.hide_notification)); + notificationView.setTitle(requireContext().getString(R.string.title_version_support_warning)); + notificationView.setMessage(requireContext().getString(R.string.message_version_support_warning)); + notificationView.setPrimaryButtonText(requireContext().getString(R.string.hide_notification)); notificationView.setPrimaryButtonListener(() -> { notificationView.setVisibility(View.GONE); diff --git a/app/src/main/java/com/alphawallet/app/ui/widget/adapter/MultiSelectNetworkAdapter.java b/app/src/main/java/com/alphawallet/app/ui/widget/adapter/MultiSelectNetworkAdapter.java index 2934e49374..2e9c761387 100644 --- a/app/src/main/java/com/alphawallet/app/ui/widget/adapter/MultiSelectNetworkAdapter.java +++ b/app/src/main/java/com/alphawallet/app/ui/widget/adapter/MultiSelectNetworkAdapter.java @@ -9,6 +9,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.alphawallet.app.R; +import com.alphawallet.app.repository.EthereumNetworkBase; import com.alphawallet.app.ui.widget.entity.NetworkItem; import com.alphawallet.app.widget.TokenIcon; import com.google.android.material.checkbox.MaterialCheckBox; @@ -76,6 +77,14 @@ public void onBindViewHolder(MultiSelectNetworkAdapter.ViewHolder holder, int po holder.manageView.setOnClickListener(v -> editListener.onEditNetwork(networkList.get(position).getChainId(), holder.manageView)); holder.checkbox.setChecked(item.isSelected()); holder.tokenIcon.bindData(item.getChainId()); + + if (EthereumNetworkBase.isNetworkDeprecated(item.getChainId())) + { + holder.deprecatedIndicator.setVisibility(View.VISIBLE); + holder.tokenIcon.setGrayscale(true); + holder.name.setAlpha(0.7f); + holder.chainId.setAlpha(0.7f); + } } } @@ -99,6 +108,7 @@ class ViewHolder extends RecyclerView.ViewHolder { View manageView; TokenIcon tokenIcon; TextView chainId; + TextView deprecatedIndicator; ViewHolder(View view) { @@ -109,6 +119,7 @@ class ViewHolder extends RecyclerView.ViewHolder { manageView = view.findViewById(R.id.manage_btn); tokenIcon = view.findViewById(R.id.token_icon); chainId = view.findViewById(R.id.chain_id); + deprecatedIndicator = view.findViewById(R.id.deprecated); } } } \ No newline at end of file diff --git a/app/src/main/java/com/alphawallet/app/ui/widget/adapter/NFTAssetsAdapter.java b/app/src/main/java/com/alphawallet/app/ui/widget/adapter/NFTAssetsAdapter.java index 0db182b9fd..be4154912c 100644 --- a/app/src/main/java/com/alphawallet/app/ui/widget/adapter/NFTAssetsAdapter.java +++ b/app/src/main/java/com/alphawallet/app/ui/widget/adapter/NFTAssetsAdapter.java @@ -17,6 +17,7 @@ import com.alphawallet.app.R; import com.alphawallet.app.entity.nftassets.NFTAsset; import com.alphawallet.app.entity.tokens.Token; +import com.alphawallet.app.service.OpenSeaService; import com.alphawallet.app.ui.NFTActivity; import com.alphawallet.app.ui.widget.OnAssetClickListener; import com.alphawallet.app.widget.NFTImageView; @@ -38,16 +39,18 @@ public class NFTAssetsAdapter extends RecyclerView.Adapter> actualData; private final List> displayData; - public NFTAssetsAdapter(Activity activity, Token token, OnAssetClickListener listener, boolean isGrid) + public NFTAssetsAdapter(Activity activity, Token token, OnAssetClickListener listener, OpenSeaService openSeaSvs, boolean isGrid) { this.activity = activity; this.listener = listener; this.token = token; this.isGrid = isGrid; + this.openSeaService = openSeaSvs; actualData = new ArrayList<>(); switch (token.getInterfaceSpec()) @@ -137,7 +140,7 @@ private void displayAsset(@NotNull ViewHolder holder, NFTAsset asset, BigInteger holder.subtitle.setVisibility(View.GONE); } - if (!asset.needsLoading()) + if (asset.hasImageAsset()) { holder.icon.setupTokenImageThumbnail(asset); } @@ -152,18 +155,40 @@ private void displayAsset(@NotNull ViewHolder holder, NFTAsset asset, BigInteger } private void fetchAsset(ViewHolder holder, Pair pair) + { + pair.second.metaDataLoader = openSeaService.getAsset(token, pair.first) + .map(NFTAsset::new) + .map(asset -> storeAsset(pair.first, asset, pair.second)) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(asset -> checkAsset(asset, holder, pair), e -> {}); + } + + private void fetchContractMetadata(ViewHolder holder, Pair pair) { pair.second.metaDataLoader = Single.fromCallable(() -> { - return token.fetchTokenMetadata(pair.first); //fetch directly from token - }).map(newAsset -> storeAsset(pair.first, newAsset, pair.second)) + return token.fetchTokenMetadata(pair.first); //fetch directly from token + }).map(newAsset -> storeAsset(pair.first, newAsset, pair.second)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(a -> displayAsset(holder, a, pair.first), e -> { - }); + .subscribe(a -> displayAsset(holder, a, pair.first), e -> {}); + } + + private void checkAsset(NFTAsset asset, ViewHolder holder, Pair pair) + { + if (asset.hasImageAsset()) + { + displayAsset(holder, asset, pair.first); + } + else + { + fetchContractMetadata(holder, pair); + } } private NFTAsset storeAsset(BigInteger tokenId, NFTAsset fetchedAsset, NFTAsset oldAsset) { + if (!fetchedAsset.hasImageAsset()) return oldAsset; fetchedAsset.updateFromRaw(oldAsset); if (activity != null && activity instanceof NFTActivity) { diff --git a/app/src/main/java/com/alphawallet/app/ui/widget/adapter/RouteAdapter.java b/app/src/main/java/com/alphawallet/app/ui/widget/adapter/RouteAdapter.java new file mode 100644 index 0000000000..0dd563796b --- /dev/null +++ b/app/src/main/java/com/alphawallet/app/ui/widget/adapter/RouteAdapter.java @@ -0,0 +1,105 @@ +package com.alphawallet.app.ui.widget.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.alphawallet.app.R; +import com.alphawallet.app.entity.lifi.Route; +import com.alphawallet.app.ui.widget.entity.OnRouteSelectedListener; +import com.alphawallet.app.util.SwapUtils; +import com.alphawallet.app.widget.AddressIcon; +import com.google.android.material.card.MaterialCardView; + +import java.util.List; + +public class RouteAdapter extends RecyclerView.Adapter +{ + private final Context context; + private final List data; + private final OnRouteSelectedListener listener; + + public RouteAdapter(Context context, List data, OnRouteSelectedListener listener) + { + this.context = context; + this.data = data; + this.listener = listener; + } + + @NonNull + @Override + public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) + { + int buttonTypeId = R.layout.item_route; + View itemView = LayoutInflater.from(parent.getContext()) + .inflate(buttonTypeId, parent, false); + return new ViewHolder(itemView); + } + + @Override + public void onBindViewHolder(@NonNull ViewHolder holder, int position) + { + Route item = data.get(position); + if (item != null) + { + Route.Step step = item.steps.get(0); + + holder.provider.setText(context.getString(R.string.label_swap_via, step.swapProvider.name)); + + for (String tag : item.tags) + { + if (tag.equalsIgnoreCase("RECOMMENDED")) + { + holder.tag.setVisibility(View.VISIBLE); + holder.tag.setText(tag); + } + } + + holder.value.setText(SwapUtils.getFormattedMinAmount(step.estimate, step.action)); + holder.icon.bindData(step.action.toToken.logoURI, step.action.toToken.chainId, step.action.toToken.address, step.action.toToken.symbol); +// holder.symbol.setText(step.action.toToken.symbol); + holder.gas.setText(context.getString(R.string.info_gas_fee, SwapUtils.getTotalGasFees(step.estimate.gasCosts))); + holder.fees.setVisibility(step.estimate.feeCosts.isEmpty() ? View.GONE : View.VISIBLE); + holder.fees.setText(SwapUtils.getOtherFees(step.estimate.feeCosts)); + holder.layout.setOnClickListener(v -> listener.onRouteSelected(step.swapProvider.key)); + } + } + + @Override + public int getItemCount() + { + return data.size(); + } + + static class ViewHolder extends RecyclerView.ViewHolder + { + MaterialCardView layout; + TextView tag; + TextView provider; + TextView value; + TextView symbol; + TextView gas; + TextView fees; + TextView price; + AddressIcon icon; + + ViewHolder(View view) + { + super(view); + layout = view.findViewById(R.id.layout); + tag = view.findViewById(R.id.tag); + provider = view.findViewById(R.id.provider); + value = view.findViewById(R.id.value); + symbol = view.findViewById(R.id.symbol); + gas = view.findViewById(R.id.gas); + fees = view.findViewById(R.id.fees); + price = view.findViewById(R.id.price); + icon = view.findViewById(R.id.token_icon); + } + } +} diff --git a/app/src/main/java/com/alphawallet/app/ui/widget/adapter/SelectChainAdapter.java b/app/src/main/java/com/alphawallet/app/ui/widget/adapter/SelectChainAdapter.java index b7e210f0fa..3f8f502b74 100644 --- a/app/src/main/java/com/alphawallet/app/ui/widget/adapter/SelectChainAdapter.java +++ b/app/src/main/java/com/alphawallet/app/ui/widget/adapter/SelectChainAdapter.java @@ -1,11 +1,9 @@ package com.alphawallet.app.ui.widget.adapter; - import android.content.Context; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.NonNull; @@ -14,7 +12,7 @@ import com.alphawallet.app.R; import com.alphawallet.app.entity.lifi.Chain; import com.alphawallet.app.widget.SwapSettingsDialog; -import com.bumptech.glide.Glide; +import com.alphawallet.app.widget.TokenIcon; import com.google.android.material.radiobutton.MaterialRadioButton; import java.util.List; @@ -51,11 +49,7 @@ public void onBindViewHolder(ViewHolder holder, int position) { holder.name.setText(item.metamask.chainName); holder.chainId.setText(context.getString(R.string.chain_id, item.id)); - - Glide.with(context) - .load(item.logoURI) - .circleCrop() - .into(holder.chainIcon); + holder.chainIcon.bindData(item.id); if (item.id == selectedChainId) { @@ -75,18 +69,18 @@ public int getItemCount() public void setChains(List chains) { this.chains = chains; - notifyDataSetChanged(); + notifyItemRangeChanged(0, getItemCount()); } - public void setSelectedChain(long selectedChainId) + public long getSelectedChain() { - this.selectedChainId = selectedChainId; - notifyDataSetChanged(); + return this.selectedChainId; } - public long getSelectedChain() + public void setSelectedChain(long selectedChainId) { - return this.selectedChainId; + this.selectedChainId = selectedChainId; + notifyItemRangeChanged(0, getItemCount()); } static class ViewHolder extends RecyclerView.ViewHolder @@ -95,7 +89,7 @@ static class ViewHolder extends RecyclerView.ViewHolder TextView name; TextView chainId; View itemLayout; - ImageView chainIcon; + TokenIcon chainIcon; ViewHolder(View view) { diff --git a/app/src/main/java/com/alphawallet/app/ui/widget/adapter/SelectTokenAdapter.java b/app/src/main/java/com/alphawallet/app/ui/widget/adapter/SelectTokenAdapter.java index 0118a9bc30..c5f32d6305 100644 --- a/app/src/main/java/com/alphawallet/app/ui/widget/adapter/SelectTokenAdapter.java +++ b/app/src/main/java/com/alphawallet/app/ui/widget/adapter/SelectTokenAdapter.java @@ -1,6 +1,5 @@ package com.alphawallet.app.ui.widget.adapter; - import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; @@ -11,7 +10,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.alphawallet.app.R; -import com.alphawallet.app.entity.lifi.Connection; +import com.alphawallet.app.entity.lifi.Token; import com.alphawallet.app.widget.AddressIcon; import com.alphawallet.app.widget.SelectTokenDialog; import com.google.android.material.radiobutton.MaterialRadioButton; @@ -21,12 +20,12 @@ public class SelectTokenAdapter extends RecyclerView.Adapter { - private final List displayData; + private final List displayData; private final SelectTokenDialog.SelectTokenDialogEventListener callback; - private String selectedTokenAddress; private final TokenFilter tokenFilter; + private String selectedTokenAddress; - public SelectTokenAdapter(List tokens, SelectTokenDialog.SelectTokenDialogEventListener callback) + public SelectTokenAdapter(List tokens, SelectTokenDialog.SelectTokenDialogEventListener callback) { tokenFilter = new TokenFilter(tokens); this.callback = callback; @@ -47,7 +46,7 @@ public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) @Override public void onBindViewHolder(@NonNull ViewHolder holder, int position) { - Connection.LToken item = displayData.get(position); + Token item = displayData.get(position); if (item != null) { holder.name.setText(item.name); @@ -56,7 +55,7 @@ public void onBindViewHolder(@NonNull ViewHolder holder, int position) holder.name.append(")"); holder.tokenIcon.bindData(item.logoURI, item.chainId, selectedTokenAddress, item.symbol); - + String balance = item.balance; if (!TextUtils.isEmpty(balance)) { @@ -80,7 +79,7 @@ public void filter(String keyword) updateList(tokenFilter.filterBy(keyword)); } - public void updateList(List filteredList) + public void updateList(List filteredList) { displayData.clear(); displayData.addAll(filteredList); diff --git a/app/src/main/java/com/alphawallet/app/ui/widget/adapter/SingleSelectNetworkAdapter.java b/app/src/main/java/com/alphawallet/app/ui/widget/adapter/SingleSelectNetworkAdapter.java index 26da36152e..d072f1c255 100644 --- a/app/src/main/java/com/alphawallet/app/ui/widget/adapter/SingleSelectNetworkAdapter.java +++ b/app/src/main/java/com/alphawallet/app/ui/widget/adapter/SingleSelectNetworkAdapter.java @@ -96,7 +96,7 @@ public int getItemCount() public void selectDefault() { - if (!hasSelection) + if (!hasSelection && !networkList.isEmpty()) { networkList.get(0).setSelected(true); notifyItemChanged(0); diff --git a/app/src/main/java/com/alphawallet/app/ui/widget/adapter/SwapProviderAdapter.java b/app/src/main/java/com/alphawallet/app/ui/widget/adapter/SwapProviderAdapter.java new file mode 100644 index 0000000000..724af0fdca --- /dev/null +++ b/app/src/main/java/com/alphawallet/app/ui/widget/adapter/SwapProviderAdapter.java @@ -0,0 +1,87 @@ +package com.alphawallet.app.ui.widget.adapter; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.RelativeLayout; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.alphawallet.app.R; +import com.alphawallet.app.entity.lifi.SwapProvider; +import com.alphawallet.app.widget.AddressIcon; +import com.google.android.material.checkbox.MaterialCheckBox; + +import java.util.List; + +public class SwapProviderAdapter extends RecyclerView.Adapter +{ + private final List data; + + public SwapProviderAdapter(List data) + { + this.data = data; + } + + @NonNull + @Override + public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) + { + int buttonTypeId = R.layout.item_exchange; + View itemView = LayoutInflater.from(parent.getContext()) + .inflate(buttonTypeId, parent, false); + return new ViewHolder(itemView); + } + + @Override + public void onBindViewHolder(@NonNull ViewHolder holder, int position) + { + SwapProvider item = data.get(position); + if (item != null) + { + holder.title.setText(item.name); + + holder.subtitle.setText(item.url); + + holder.icon.bindData(item.logoURI, -1, "", ""); + + holder.layout.setOnClickListener(v -> holder.checkBox.setChecked(!item.isChecked)); + + holder.checkBox.setOnCheckedChangeListener((buttonView, isChecked) -> item.isChecked = isChecked); + + holder.checkBox.setChecked(item.isChecked); + } + } + + public List getExchanges() + { + return data; + } + + @Override + public int getItemCount() + { + return data.size(); + } + + static class ViewHolder extends RecyclerView.ViewHolder + { + RelativeLayout layout; + AddressIcon icon; + TextView title; + TextView subtitle; + MaterialCheckBox checkBox; + + ViewHolder(View view) + { + super(view); + layout = view.findViewById(R.id.layout_list_item); + icon = view.findViewById(R.id.token_icon); + title = view.findViewById(R.id.provider); + subtitle = view.findViewById(R.id.subtitle); + checkBox = view.findViewById(R.id.checkbox); + } + } +} diff --git a/app/src/main/java/com/alphawallet/app/ui/widget/adapter/TokenFilter.java b/app/src/main/java/com/alphawallet/app/ui/widget/adapter/TokenFilter.java index dd57ff6a6d..1e9fb39653 100644 --- a/app/src/main/java/com/alphawallet/app/ui/widget/adapter/TokenFilter.java +++ b/app/src/main/java/com/alphawallet/app/ui/widget/adapter/TokenFilter.java @@ -1,29 +1,46 @@ package com.alphawallet.app.ui.widget.adapter; +import android.text.TextUtils; + import androidx.annotation.NonNull; -import com.alphawallet.app.entity.lifi.Connection; +import com.alphawallet.app.entity.lifi.Token; import java.util.ArrayList; import java.util.List; +import java.util.ListIterator; import java.util.Locale; public class TokenFilter { - private final List tokens; + private final List tokens; - public TokenFilter(List tokens) + public TokenFilter(List tokens) { this.tokens = tokens; + removeBadTokens(); + } + + private void removeBadTokens() + { + ListIterator iterator = this.tokens.listIterator(); + while (iterator.hasNext()) + { + Token t = iterator.next(); + if (TextUtils.isEmpty(t.name) || TextUtils.isEmpty(t.symbol)) + { + iterator.remove(); + } + } } - public List filterBy(String keyword) + public List filterBy(String keyword) { String lowerCaseKeyword = lowerCase(keyword); - List result = new ArrayList<>(); + List result = new ArrayList<>(); // First filter: Add all entries that start with the keyword on top of the list. - for (Connection.LToken lToken : this.tokens) + for (Token lToken : this.tokens) { String name = lowerCase(lToken.name); String symbol = lowerCase(lToken.symbol); @@ -35,7 +52,7 @@ public List filterBy(String keyword) } // Second filter: Add the rest of the entries that contain the keyword on top of the list. - for (Connection.LToken lToken : this.tokens) + for (Token lToken : this.tokens) { String name = lowerCase(lToken.name); String symbol = lowerCase(lToken.symbol); diff --git a/app/src/main/java/com/alphawallet/app/ui/widget/entity/IconItem.java b/app/src/main/java/com/alphawallet/app/ui/widget/entity/IconItem.java index 61023be6c6..dbff547845 100644 --- a/app/src/main/java/com/alphawallet/app/ui/widget/entity/IconItem.java +++ b/app/src/main/java/com/alphawallet/app/ui/widget/entity/IconItem.java @@ -2,8 +2,6 @@ import static com.alphawallet.app.repository.TokensRealmSource.databaseKey; -import com.bumptech.glide.signature.ObjectKey; - import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -44,12 +42,6 @@ public static void secondaryFound(long chainId, String address) iconLoadType.put(databaseKey(chainId, address.toLowerCase()), true); } - //Use TextIcon - public static void noIconFound(long chainId, String address) - { - iconLoadType.put(databaseKey(chainId, address.toLowerCase()), false); - } - /** * Resets the failed icon fetch checking - try again to load failed icons */ diff --git a/app/src/main/java/com/alphawallet/app/ui/widget/entity/OnRouteSelectedListener.java b/app/src/main/java/com/alphawallet/app/ui/widget/entity/OnRouteSelectedListener.java new file mode 100644 index 0000000000..2592a3bb57 --- /dev/null +++ b/app/src/main/java/com/alphawallet/app/ui/widget/entity/OnRouteSelectedListener.java @@ -0,0 +1,6 @@ +package com.alphawallet.app.ui.widget.entity; + +public interface OnRouteSelectedListener +{ + void onRouteSelected(String provider); +} diff --git a/app/src/main/java/com/alphawallet/app/ui/widget/entity/ProgressInfo.java b/app/src/main/java/com/alphawallet/app/ui/widget/entity/ProgressInfo.java new file mode 100644 index 0000000000..e5523168e5 --- /dev/null +++ b/app/src/main/java/com/alphawallet/app/ui/widget/entity/ProgressInfo.java @@ -0,0 +1,28 @@ +package com.alphawallet.app.ui.widget.entity; + +public class ProgressInfo +{ + private boolean shouldShow; + private int messageRes; + + public ProgressInfo(boolean shouldShow, int messageRes) + { + this.shouldShow = shouldShow; + this.messageRes = messageRes; + } + + public ProgressInfo(boolean shouldShow) + { + this.shouldShow = shouldShow; + } + + public boolean shouldShow() + { + return shouldShow; + } + + public int getMessage() + { + return messageRes; + } +} diff --git a/app/src/main/java/com/alphawallet/app/util/SwapUtils.java b/app/src/main/java/com/alphawallet/app/util/SwapUtils.java index baee0d76b4..b69f0f4a64 100644 --- a/app/src/main/java/com/alphawallet/app/util/SwapUtils.java +++ b/app/src/main/java/com/alphawallet/app/util/SwapUtils.java @@ -1,5 +1,9 @@ package com.alphawallet.app.util; +import com.alphawallet.app.entity.lifi.Action; +import com.alphawallet.app.entity.lifi.Estimate; +import com.alphawallet.app.entity.lifi.FeeCost; +import com.alphawallet.app.entity.lifi.GasCost; import com.alphawallet.app.entity.lifi.Quote; import java.math.BigDecimal; @@ -7,39 +11,59 @@ public class SwapUtils { + private static final String CURRENT_PRICE_FORMAT = "1 %s ≈ %s %s"; private static final String GAS_PRICE_FORMAT = "%s %s"; + private static final String FEE_FORMAT = "%s %s"; private static final String MINIMUM_RECEIVED_FORMAT = "%s %s"; - private static final String CURRENT_PRICE_FORMAT = "1 %s ≈ %s %s"; - public static String getTotalGasFees(ArrayList gasCosts) + public static String getTotalGasFees(ArrayList gasCosts) { StringBuilder gas = new StringBuilder(); - for (Quote.Estimate.GasCost gc : gasCosts) + for (GasCost gc : gasCosts) { gas.append(SwapUtils.getGasFee(gc)).append(System.lineSeparator()); } return gas.toString().trim(); } - public static String getGasFee(Quote.Estimate.GasCost gasCost) + public static String getGasFee(GasCost gasCost) { return String.format(GAS_PRICE_FORMAT, BalanceUtils.getScaledValueFixed(new BigDecimal(gasCost.amount), gasCost.token.decimals, 4), gasCost.token.symbol); } - public static String getFormattedCurrentPrice(Quote quote) + public static String getOtherFees(ArrayList feeCosts) + { + StringBuilder fees = new StringBuilder(); + for (FeeCost fc : feeCosts) + { + fees.append(fc.name); + fees.append(": "); + fees.append(SwapUtils.getFee(fc)).append(System.lineSeparator()); + } + return fees.toString().trim(); + } + + public static String getFee(FeeCost feeCost) + { + return String.format(FEE_FORMAT, + BalanceUtils.getScaledValueFixed(new BigDecimal(feeCost.amount), feeCost.token.decimals, 4), + feeCost.token.symbol); + } + + public static String getFormattedCurrentPrice(Action action) { return String.format(CURRENT_PRICE_FORMAT, - quote.action.fromToken.symbol, - quote.getCurrentPrice(), - quote.action.toToken.symbol); + action.fromToken.symbol, + action.getCurrentPrice(), + action.toToken.symbol); } - public static String getMinimumAmountReceived(Quote quote) + public static String getFormattedMinAmount(Estimate estimate, Action action) { return String.format(MINIMUM_RECEIVED_FORMAT, - BalanceUtils.getShortFormat(quote.estimate.toAmountMin, quote.action.toToken.decimals), - quote.action.toToken.symbol); + BalanceUtils.getScaledValue(estimate.toAmountMin, action.toToken.decimals, 4), + action.toToken.symbol); } } diff --git a/app/src/main/java/com/alphawallet/app/util/Utils.java b/app/src/main/java/com/alphawallet/app/util/Utils.java index 169aeb9076..7aa601cfaa 100644 --- a/app/src/main/java/com/alphawallet/app/util/Utils.java +++ b/app/src/main/java/com/alphawallet/app/util/Utils.java @@ -20,7 +20,6 @@ import android.text.TextUtils; import android.text.format.DateUtils; import android.text.style.StyleSpan; -import android.util.Patterns; import android.util.TypedValue; import android.webkit.URLUtil; @@ -31,6 +30,7 @@ import com.alphawallet.app.C; import com.alphawallet.app.R; import com.alphawallet.app.entity.tokens.Token; +import com.alphawallet.app.util.pattern.Patterns; import com.alphawallet.app.web3j.StructuredDataEncoder; import com.alphawallet.token.entity.ProviderTypedData; import com.alphawallet.token.entity.Signable; @@ -68,18 +68,19 @@ import timber.log.Timber; -public class Utils { - +public class Utils +{ private static final String ISOLATE_NUMERIC = "(0?x?[0-9a-fA-F]+)"; private static final String ICON_REPO_ADDRESS_TOKEN = "[TOKEN]"; private static final String CHAIN_REPO_ADDRESS_TOKEN = "[CHAIN]"; private static final String TOKEN_LOGO = "/logo.png"; - public static final String ALPHAWALLET_REPO_NAME = "https://raw.githubusercontent.com/alphawallet/iconassets/lowercased/"; + public static final String ALPHAWALLET_REPO_NAME = "https://raw.githubusercontent.com/alphawallet/iconassets/master/"; private static final String TRUST_ICON_REPO_BASE = "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/"; private static final String TRUST_ICON_REPO = TRUST_ICON_REPO_BASE + CHAIN_REPO_ADDRESS_TOKEN + "/assets/" + ICON_REPO_ADDRESS_TOKEN + TOKEN_LOGO; private static final String ALPHAWALLET_ICON_REPO = ALPHAWALLET_REPO_NAME + ICON_REPO_ADDRESS_TOKEN + TOKEN_LOGO; - public static int dp2px(Context context, int dp) { + public static int dp2px(Context context, int dp) + { Resources r = context.getResources(); return (int) TypedValue.applyDimension( TypedValue.COMPLEX_UNIT_DIP, @@ -88,22 +89,31 @@ public static int dp2px(Context context, int dp) { ); } - public static String formatUrl(String url) { - if (URLUtil.isHttpsUrl(url) || URLUtil.isHttpUrl(url)) { + public static String formatUrl(String url) + { + if (URLUtil.isHttpsUrl(url) || URLUtil.isHttpUrl(url)) + { return url; - } else { - if (isValidUrl(url)) { + } + else + { + if (isValidUrl(url)) + { return C.HTTPS_PREFIX + url; - } else { + } + else + { return C.INTERNET_SEARCH_PREFIX + url; } } } - public static boolean isValidUrl(String url) { + public static boolean isValidUrl(String url) + { + if (TextUtils.isEmpty(url)) return false; Pattern p = Patterns.WEB_URL; Matcher m = p.matcher(url.toLowerCase()); - return m.matches(); + return m.matches() || isIPFS(url); } public static boolean isAlNum(String testStr) @@ -146,7 +156,8 @@ public static boolean isValidValue(String testStr) return result; } - private static String getFirstWord(String text) { + private static String getFirstWord(String text) + { if (TextUtils.isEmpty(text)) return ""; text = text.trim(); int index; @@ -269,7 +280,7 @@ public static CharSequence createFormattedValue(Context ctx, String operationNam int spaceIndex = operationName.lastIndexOf(' '); if (spaceIndex > 0) { - operationName = operationName.substring(0, spaceIndex) + '\n' + operationName.substring(spaceIndex+1); + operationName = operationName.substring(0, spaceIndex) + '\n' + operationName.substring(spaceIndex + 1); } else { @@ -298,16 +309,20 @@ public static CharSequence createFormattedValue(Context ctx, String operationNam return sb; } - public static String loadJSONFromAsset(Context context, String fileName) { + public static String loadJSONFromAsset(Context context, String fileName) + { String json = null; - try { + try + { InputStream is = context.getAssets().open(fileName); int size = is.available(); byte[] buffer = new byte[size]; is.read(buffer); is.close(); json = new String(buffer, StandardCharsets.UTF_8); - } catch (IOException ex) { + } + catch (IOException ex) + { ex.printStackTrace(); return null; } @@ -374,7 +389,8 @@ public static List longListToArray(String list) public static int[] bigIntegerListToIntList(List ticketSendIndexList) { int[] indexList = new int[ticketSendIndexList.size()]; - for (int i = 0; i < ticketSendIndexList.size(); i++) indexList[i] = ticketSendIndexList.get(i).intValue(); + for (int i = 0; i < ticketSendIndexList.size(); i++) + indexList[i] = ticketSendIndexList.get(i).intValue(); return indexList; } @@ -395,6 +411,7 @@ public static BigInteger parseTokenId(String tokenIdStr) /** * Produce a string CSV of integer IDs given an input list of values + * * @param idList * @param keepZeros * @return @@ -453,7 +470,7 @@ public static String integerListToString(List intList, boolean keepZero for (Integer id : intList) { if (!keepZeros && id == 0) continue; - if (!first)sb.append(","); + if (!first) sb.append(","); sb.append(id); first = false; } @@ -478,7 +495,10 @@ public static boolean isNumeric(String numString) for (int i = 0; i < numString.length(); i++) { - if (Character.digit(numString.charAt(i), 10) == -1) { return false; } + if (Character.digit(numString.charAt(i), 10) == -1) + { + return false; + } } return true; @@ -491,7 +511,10 @@ public static boolean isHex(String hexStr) for (int i = 0; i < hexStr.length(); i++) { - if (Character.digit(hexStr.charAt(i), 16) == -1) { return false; } + if (Character.digit(hexStr.charAt(i), 16) == -1) + { + return false; + } } return true; @@ -518,7 +541,8 @@ public static String isolateNumeric(String valueFromInput) return valueFromInput; } - public static String formatAddress(String address) { + public static String formatAddress(String address) + { if (isAddressValid(address)) { address = Keys.toChecksumAddress(address); @@ -535,12 +559,15 @@ public static String formatAddress(String address) { /** * Just enough for diagnosis of most errors + * * @param s String to be HTML escaped * @return escaped string */ - public static String escapeHTML(String s) { + public static String escapeHTML(String s) + { StringBuilder out = new StringBuilder(Math.max(16, s.length())); - for (int i = 0; i < s.length(); i++) { + for (int i = 0; i < s.length(); i++) + { char c = s.charAt(i); switch (c) { @@ -565,12 +592,12 @@ public static String escapeHTML(String s) { public static String convertTimePeriodInSeconds(long pendingTimeInSeconds, Context ctx) { - long days = pendingTimeInSeconds/(60*60*24); - pendingTimeInSeconds -= (days*60*60*24); - long hours = pendingTimeInSeconds/(60*60); - pendingTimeInSeconds -= (hours*60*60); - long minutes = pendingTimeInSeconds/60; - long seconds = pendingTimeInSeconds%60; + long days = pendingTimeInSeconds / (60 * 60 * 24); + pendingTimeInSeconds -= (days * 60 * 60 * 24); + long hours = pendingTimeInSeconds / (60 * 60); + pendingTimeInSeconds -= (hours * 60 * 60); + long minutes = pendingTimeInSeconds / 60; + long seconds = pendingTimeInSeconds % 60; StringBuilder sb = new StringBuilder(); int timePoints = 0; @@ -647,12 +674,12 @@ public static String convertTimePeriodInSeconds(long pendingTimeInSeconds, Conte public static String shortConvertTimePeriodInSeconds(long pendingTimeInSeconds, Context ctx) { - long days = pendingTimeInSeconds/(60*60*24); - pendingTimeInSeconds -= (days*60*60*24); - long hours = pendingTimeInSeconds/(60*60); - pendingTimeInSeconds -= (hours*60*60); - long minutes = pendingTimeInSeconds/60; - long seconds = pendingTimeInSeconds%60; + long days = pendingTimeInSeconds / (60 * 60 * 24); + pendingTimeInSeconds -= (days * 60 * 60 * 24); + long hours = pendingTimeInSeconds / (60 * 60); + pendingTimeInSeconds -= (hours * 60 * 60); + long minutes = pendingTimeInSeconds / 60; + long seconds = pendingTimeInSeconds % 60; String timeStr; @@ -672,7 +699,7 @@ else if (hours > 0) } else { - BigDecimal hourStr = BigDecimal.valueOf(hours + (double)minutes/60.0) + BigDecimal hourStr = BigDecimal.valueOf(hours + (double) minutes / 60.0) .setScale(1, RoundingMode.HALF_DOWN); //to 1 dp timeStr = ctx.getString(R.string.hour_plural, hourStr.toString()); } @@ -685,7 +712,7 @@ else if (minutes > 0) } else { - BigDecimal minsStr = BigDecimal.valueOf(minutes + (double)seconds/60.0) + BigDecimal minsStr = BigDecimal.valueOf(minutes + (double) seconds / 60.0) .setScale(1, RoundingMode.HALF_DOWN); //to 1 dp timeStr = ctx.getString(R.string.minute_plural, minsStr.toString()); } @@ -720,7 +747,8 @@ public static String localiseUnixDate(Context ctx, long timeStampInSec) return timeFormat.format(date) + " | " + dateFormat.format(date); } - public static long randomId() { + public static long randomId() + { return new Date().getTime(); } @@ -770,7 +798,8 @@ public static String getTokenAddrFromAWUrl(String url) return ""; } - private static final Map twChainNames = new HashMap() { + private static final Map twChainNames = new HashMap() + { { put(CLASSIC_ID, "classic"); put(GNOSIS_ID, "xdai"); @@ -806,30 +835,35 @@ public static boolean isContractCall(Context context, String operationName) private static final String IPFS_PREFIX = "ipfs://"; private static final String IPFS_DESIGNATOR = "/ipfs/"; - private static final String IPFS_INFURA_RESOLVER = "https://alphawallet.infura-ipfs.io"; - private static final String IPFS_IO_RESOLVER = "https://ipfs.io"; + public static final String IPFS_INFURA_RESOLVER = "https://alphawallet.infura-ipfs.io"; + public static final String IPFS_IO_RESOLVER = "https://ipfs.io"; public static boolean isIPFS(String url) { - return url.contains(IPFS_DESIGNATOR) || url.startsWith(IPFS_PREFIX); + return url.contains(IPFS_DESIGNATOR) || url.startsWith(IPFS_PREFIX) || shouldBeIPFS(url); } public static String parseIPFS(String URL) + { + return resolveIPFS(URL, IPFS_INFURA_RESOLVER); + } + + public static String resolveIPFS(String URL, String resolver) { if (TextUtils.isEmpty(URL)) return URL; String parsed = URL; int ipfsIndex = URL.lastIndexOf(IPFS_DESIGNATOR); if (ipfsIndex >= 0) { - parsed = IPFS_INFURA_RESOLVER + URL.substring(ipfsIndex); + parsed = resolver + URL.substring(ipfsIndex); } else if (URL.startsWith(IPFS_PREFIX)) { - parsed = IPFS_INFURA_RESOLVER + IPFS_DESIGNATOR + URL.substring(IPFS_PREFIX.length()); + parsed = resolver + IPFS_DESIGNATOR + URL.substring(IPFS_PREFIX.length()); } else if (shouldBeIPFS(URL)) //have seen some NFTs designating only the IPFS hash { - parsed = IPFS_INFURA_RESOLVER + IPFS_DESIGNATOR + URL; + parsed = resolver + IPFS_DESIGNATOR + URL; } return parsed; @@ -840,16 +874,21 @@ private static boolean shouldBeIPFS(String url) return url.startsWith("Qm") && url.length() == 46 && !url.contains(".") && !url.contains("/"); } - public static String loadFile(Context context, @RawRes int rawRes) { + public static String loadFile(Context context, @RawRes int rawRes) + { byte[] buffer = new byte[0]; - try { + try + { InputStream in = context.getResources().openRawResource(rawRes); buffer = new byte[in.available()]; int len = in.read(buffer); - if (len < 1) { + if (len < 1) + { throw new IOException("Nothing is read."); } - } catch (Exception ex) { + } + catch (Exception ex) + { Timber.tag("READ_JS_TAG").d(ex, "Ex"); } return new String(buffer); @@ -861,12 +900,14 @@ public static long timeUntil(long eventInMillis) } //TODO: detect various App Library installs and re-direct appropriately - public static boolean verifyInstallerId(Context context) { + public static boolean verifyInstallerId(Context context) + { try { PackageManager packageManager = context.getPackageManager(); String installingPackageName; - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) + { final InstallSourceInfo installer = packageManager.getInstallSourceInfo(context.getPackageName()); installingPackageName = installer.getInstallingPackageName(); } @@ -891,16 +932,20 @@ public static boolean isTransactionHash(String input) if (input == null || (input.length() != 66 && input.length() != 64)) return false; String cleanInput = Numeric.cleanHexPrefix(input); - try { + try + { Numeric.toBigIntNoPrefix(cleanInput); - } catch (NumberFormatException e) { + } + catch (NumberFormatException e) + { return false; } return cleanInput.length() == 64; } - public static @ColorInt int getColorFromAttr(Context context, int resId) + public static @ColorInt + int getColorFromAttr(Context context, int resId) { TypedValue typedValue = new TypedValue(); Resources.Theme theme = context.getTheme(); @@ -980,7 +1025,8 @@ else if (context instanceof ContextWrapper) } } - public static String removeDoubleQuotes(String string) { + public static String removeDoubleQuotes(String string) + { return string != null ? string.replace("\"", "") : null; } } diff --git a/app/src/main/java/com/alphawallet/app/util/ens/EnsResolver.java b/app/src/main/java/com/alphawallet/app/util/ens/EnsResolver.java index 5bdf7b9ac0..e17abc12ff 100644 --- a/app/src/main/java/com/alphawallet/app/util/ens/EnsResolver.java +++ b/app/src/main/java/com/alphawallet/app/util/ens/EnsResolver.java @@ -59,12 +59,17 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import io.reactivex.Single; +import io.reactivex.schedulers.Schedulers; import okhttp3.MediaType; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.RequestBody; import okhttp3.ResponseBody; +import timber.log.Timber; /** Resolution logic for contract addresses. According to https://eips.ethereum.org/EIPS/eip-2544 */ public class EnsResolver implements Resolvable @@ -76,12 +81,13 @@ public class EnsResolver implements Resolvable // Permit number offchain calls for a single contract call. public static final int LOOKUP_LIMIT = 4; + private static final long ENS_CACHE_TIME_VALIDITY = 10 * (1000*60); //10 minutes public static final String REVERSE_NAME_SUFFIX = ".addr.reverse"; private final Web3j web3j; protected final int addressLength; - protected final long chainId; + protected long chainId; private OkHttpClient client = new OkHttpClient(); @@ -92,31 +98,77 @@ public EnsResolver(Web3j web3j, int addressLength) this.web3j = web3j; this.addressLength = addressLength; - long chainId = 1; + chainId = 1; - try - { + Single.fromCallable(() -> { NetVersion v = web3j.netVersion().send(); String ver = v.getNetVersion(); - chainId = Long.parseLong(ver); - } - catch (Exception e) - { - // - } - - this.chainId = chainId; + return Long.parseLong(ver); + }).subscribeOn(Schedulers.io()) + .observeOn(Schedulers.io()) + .subscribe(id -> this.chainId = id, Timber::w) + .isDisposed(); } public EnsResolver(Web3j web3j) { this(web3j, Keys.ADDRESS_LENGTH_IN_HEX); } - protected ContractAddress obtainOffchainResolverAddr(String ensName) throws Exception + protected ContractAddress obtainOffChainResolverAddress(String ensName) throws Exception { return new ContractAddress(chainId, getResolverAddress(ensName)); } + private static class CachedENSRead + { + public final String cachedResult; + public final long cachedResultTime; + + public CachedENSRead(String result) + { + cachedResult = result; + cachedResultTime = System.currentTimeMillis(); + } + + public boolean isValid() + { + return System.currentTimeMillis() < (cachedResultTime + ENS_CACHE_TIME_VALIDITY); //10 minutes cache validity + } + } + + //Need to cache results for Resolve + private static final Map cachedNameReads = new ConcurrentHashMap<>(); + + private String cacheKey(String ensName, String addrFunction) + { + return ((ensName != null) ? ensName : "") + "%" + ((addrFunction != null) ? addrFunction : ""); + } + + private String resolveWithCaching(String ensName, byte[] nameHash, String resolverAddr) throws Exception + { + String dnsEncoded = NameHash.dnsEncode(ensName); + String addrFunction = encodeResolverAddr(nameHash); + + CachedENSRead lookupData = cachedNameReads.get(cacheKey(ensName, addrFunction)); + String lookupDataHex = lookupData != null ? lookupData.cachedResult : null; + + if (lookupData == null || !lookupData.isValid()) + { + EthCall result = + resolve( + Numeric.hexStringToByteArray(dnsEncoded), + Numeric.hexStringToByteArray(addrFunction), + resolverAddr); + lookupDataHex = result.isReverted() ? Utils.removeDoubleQuotes(result.getError().getData()) : result.getValue();// .toString(); + if (!TextUtils.isEmpty(lookupDataHex) && !lookupDataHex.equals("0x")) + { + cachedNameReads.put(cacheKey(ensName, addrFunction), new CachedENSRead(lookupDataHex)); + } + } + + return lookupDataHex; + } + /** * Returns the address of the resolver for the specified node. * @@ -133,7 +185,7 @@ public String resolve(String ensName) throws Exception try { if (isValidEnsName(ensName, addressLength)) { - ContractAddress resolverAddress = obtainOffchainResolverAddr(ensName); + ContractAddress resolverAddress = obtainOffChainResolverAddress(ensName); boolean supportWildcard = supportsInterface(EnsUtils.ENSIP_10_INTERFACE_ID, resolverAddress.address); @@ -141,16 +193,7 @@ public String resolve(String ensName) throws Exception String resolvedName; if (supportWildcard) { - String dnsEncoded = NameHash.dnsEncode(ensName); - String addrFunction = encodeResolverAddr(nameHash); - - EthCall result = - resolve( - Numeric.hexStringToByteArray(dnsEncoded), - Numeric.hexStringToByteArray(addrFunction), - resolverAddress.address); - - String lookupDataHex = result.isReverted() ? Utils.removeDoubleQuotes(result.getError().getData()) : result.getValue();// .toString(); + String lookupDataHex = resolveWithCaching(ensName, nameHash, resolverAddress.address); resolvedName = resolveOffchain(lookupDataHex, resolverAddress, LOOKUP_LIMIT); } else { try { @@ -359,7 +402,7 @@ public String reverseResolve(String address) throws Exception if (WalletUtils.isValidAddress(address, addressLength)) { String reverseName = Numeric.cleanHexPrefix(address) + REVERSE_NAME_SUFFIX; - ContractAddress resolverAddress = obtainOffchainResolverAddr(reverseName); + ContractAddress resolverAddress = obtainOffChainResolverAddress(reverseName); byte[] nameHash = NameHash.nameHashAsBytes(reverseName); String name; @@ -438,11 +481,27 @@ public boolean supportsInterface(byte[] interfaceID, String address) throws Exce public String resolverAddr(byte[] node, String address) throws Exception { - final org.web3j.abi.datatypes.Function function = new org.web3j.abi.datatypes.Function(FUNC_addr, - Arrays.asList(new org.web3j.abi.datatypes.generated.Bytes32(node)), - Arrays.>asList(new TypeReference

() {})); + //use caching + String nodeData = Numeric.toHexString(node); + CachedENSRead resolverData = cachedNameReads.get(cacheKey(nodeData, address)); + String resolverAddr = resolverData != null ? resolverData.cachedResult : null; - return getContractData(address, function, ""); + if (resolverData == null || !resolverData.isValid()) + { + final org.web3j.abi.datatypes.Function function = new org.web3j.abi.datatypes.Function(FUNC_addr, + Arrays.asList(new org.web3j.abi.datatypes.generated.Bytes32(node)), + Arrays.>asList(new TypeReference
() + { + })); + + resolverAddr = getContractData(address, function, ""); + if (!TextUtils.isEmpty(resolverAddr) && resolverAddr.length() > 2) + { + cachedNameReads.put(cacheKey(nodeData, address), new CachedENSRead(resolverAddr)); + } + } + + return resolverAddr; } public String encodeResolverAddr(byte[] node) diff --git a/app/src/main/java/com/alphawallet/app/util/pattern/Patterns.java b/app/src/main/java/com/alphawallet/app/util/pattern/Patterns.java new file mode 100644 index 0000000000..cf15e07199 --- /dev/null +++ b/app/src/main/java/com/alphawallet/app/util/pattern/Patterns.java @@ -0,0 +1,79 @@ +package com.alphawallet.app.util.pattern; + +import java.util.regex.Pattern; + +/** + * Created by JB on 1/11/2022. + * + * Lifted from Android OS standard 'Patterns' file + * Reason for separation :- Android file not available for test suite + * + */ +public class Patterns +{ + private static final String UCS_CHAR = "[" + + "\u00A0-\uD7FF" + + "\uF900-\uFDCF" + + "\uFDF0-\uFFEF" + + "\uD800\uDC00-\uD83F\uDFFD" + + "\uD840\uDC00-\uD87F\uDFFD" + + "\uD880\uDC00-\uD8BF\uDFFD" + + "\uD8C0\uDC00-\uD8FF\uDFFD" + + "\uD900\uDC00-\uD93F\uDFFD" + + "\uD940\uDC00-\uD97F\uDFFD" + + "\uD980\uDC00-\uD9BF\uDFFD" + + "\uD9C0\uDC00-\uD9FF\uDFFD" + + "\uDA00\uDC00-\uDA3F\uDFFD" + + "\uDA40\uDC00-\uDA7F\uDFFD" + + "\uDA80\uDC00-\uDABF\uDFFD" + + "\uDAC0\uDC00-\uDAFF\uDFFD" + + "\uDB00\uDC00-\uDB3F\uDFFD" + + "\uDB44\uDC00-\uDB7F\uDFFD" + + "&&[^\u00A0[\u2000-\u200A]\u2028\u2029\u202F\u3000]]"; + + private static final String LABEL_CHAR = "a-zA-Z0-9" + UCS_CHAR; + + /** + * Valid characters for IRI TLD defined in RFC 3987. + */ + + private static final String WORD_BOUNDARY = "(?:\\b|$|^)"; + private static final String IRI_LABEL = + "[" + LABEL_CHAR + "](?:[" + LABEL_CHAR + "_\\-]{0,61}[" + LABEL_CHAR + "]){0,1}"; + private static final String PUNYCODE_TLD = "xn\\-\\-[\\w\\-]{0,58}\\w"; + private static final String TLD_CHAR = "a-zA-Z" + UCS_CHAR; + private static final String TLD = "(" + PUNYCODE_TLD + "|" + "[" + TLD_CHAR + "]{2,63}" +")"; + + private static final String USER_INFO = "(?:[a-zA-Z0-9\\$\\-\\_\\.\\+\\!\\*\\'\\(\\)" + + "\\,\\;\\?\\&\\=]|(?:\\%[a-fA-F0-9]{2})){1,64}(?:\\:(?:[a-zA-Z0-9\\$\\-\\_" + + "\\.\\+\\!\\*\\'\\(\\)\\,\\;\\?\\&\\=]|(?:\\%[a-fA-F0-9]{2})){1,25})?\\@"; + + private static final String HOST_NAME = "(" + IRI_LABEL + "\\.)+" + TLD; + + private static final String IP_ADDRESS_STRING = + "((25[0-5]|2[0-4][0-9]|[0-1][0-9]{2}|[1-9][0-9]|[1-9])\\.(25[0-5]|2[0-4]" + + "[0-9]|[0-1][0-9]{2}|[1-9][0-9]|[1-9]|0)\\.(25[0-5]|2[0-4][0-9]|[0-1]" + + "[0-9]{2}|[1-9][0-9]|[1-9]|0)\\.(25[0-5]|2[0-4][0-9]|[0-1][0-9]{2}" + + "|[1-9][0-9]|[0-9]))"; + + private static final String DOMAIN_NAME_STR = "(" + HOST_NAME + "|" + IP_ADDRESS_STRING + ")"; + public static final Pattern DOMAIN_NAME = Pattern.compile(DOMAIN_NAME_STR); + + private static final String PROTOCOL = "(?i:http|https|rtsp|ftp)://"; + + private static final String PORT_NUMBER = "\\:\\d{1,5}"; + + private static final String PATH_AND_QUERY = "[/\\?](?:(?:[" + LABEL_CHAR + + ";/\\?:@&=#~" // plus optional query params + + "\\-\\.\\+!\\*'\\(\\),_\\$])|(?:%[a-fA-F0-9]{2}))*"; + + public static Pattern WEB_URL = Pattern.compile("(" + + "(" + + "(?:" + PROTOCOL + "(?:" + USER_INFO + ")?" + ")?" + + "(?:" + DOMAIN_NAME_STR + ")" + + "(?:" + PORT_NUMBER + ")?" + + ")" + + "(" + PATH_AND_QUERY + ")?" + + WORD_BOUNDARY + + ")"); +} diff --git a/app/src/main/java/com/alphawallet/app/viewmodel/DappBrowserViewModel.java b/app/src/main/java/com/alphawallet/app/viewmodel/DappBrowserViewModel.java index 6b52a45fe8..086cac205a 100644 --- a/app/src/main/java/com/alphawallet/app/viewmodel/DappBrowserViewModel.java +++ b/app/src/main/java/com/alphawallet/app/viewmodel/DappBrowserViewModel.java @@ -1,6 +1,7 @@ package com.alphawallet.app.viewmodel; import static com.alphawallet.app.C.Key.WALLET; +import static com.alphawallet.app.util.Utils.isValidUrl; import android.app.Activity; import android.content.Context; @@ -35,7 +36,7 @@ import com.alphawallet.app.ui.HomeActivity; import com.alphawallet.app.ui.ImportTokenActivity; import com.alphawallet.app.ui.MyAddressActivity; -import com.alphawallet.app.ui.QRScanning.QRScanner; +import com.alphawallet.app.ui.QRScanning.QRScannerActivity; import com.alphawallet.app.ui.SendActivity; import com.alphawallet.app.ui.WalletConnectActivity; import com.alphawallet.app.util.DappBrowserUtils; @@ -185,7 +186,7 @@ public void onClearBrowserCacheClicked(Context context) { } public void startScan(Activity activity) { - Intent intent = new Intent(activity, QRScanner.class); + Intent intent = new Intent(activity, QRScannerActivity.class); activity.startActivityForResult(intent, HomeActivity.DAPP_BARCODE_READER_REQUEST_CODE); } @@ -334,9 +335,10 @@ public Single calculateGasEstimate(Wallet wallet, Web3Transaction tr } } + // Use the backup node if avail public String getNetworkNodeRPC(long chainId) { - return ethereumNetworkRepository.getNetworkByChain(chainId).rpcServerUrl; + return ethereumNetworkRepository.getDappBrowserRPC(chainId); } public NetworkInfo getNetworkInfo(long chainId) @@ -350,15 +352,49 @@ public String getSessionId(String url) return Uri.parse(uriString).getUserInfo(); } - public void addCustomChain(WalletAddEthereumChainObject chainObject) { - this.ethereumNetworkRepository.saveCustomRPCNetwork(chainObject.chainName, extractRpc(chainObject), chainObject.getChainId(), - chainObject.nativeCurrency.symbol, "", "", false, -1L); + public boolean addCustomChain(WalletAddEthereumChainObject chainObject) + { + String rpc = extractRpc(chainObject); + if (rpc == null) return false; + + this.ethereumNetworkRepository.saveCustomRPCNetwork(chainObject.chainName, rpc, chainObject.getChainId(), + chainObject.nativeCurrency.symbol, extractBlockExplorer(chainObject), "", false, -1L); tokensService.createBaseToken(chainObject.getChainId()) .subscribeOn(Schedulers.io()) .observeOn(Schedulers.io()) - .subscribe(w -> { }, e -> { }) + .subscribe(w -> {}, e -> {}) .isDisposed(); + + return true; + } + + private String extractBlockExplorer(WalletAddEthereumChainObject chainObject) + { + for (String thisRpc : chainObject.blockExplorerUrls) + { + if (isValidUrl(thisRpc)) //ensure RPC doesn't contain malicious code + { + String retRpc = thisRpc; + if (thisRpc.endsWith("/tx")) + { + retRpc = thisRpc + "/"; + } + else if (!thisRpc.endsWith("/tx/")) + { + if (!thisRpc.endsWith("/")) + { + retRpc = thisRpc + "/"; + } + + retRpc = retRpc + "tx/"; + } + + return retRpc; + } + } + + return ""; } //NB Chain descriptions can contain WSS socket defs, which might come first. @@ -366,10 +402,13 @@ private String extractRpc(WalletAddEthereumChainObject chainObject) { for (String thisRpc : chainObject.rpcUrls) { - if (thisRpc.toLowerCase().startsWith("http")) { return thisRpc; } + if (isValidUrl(thisRpc)) //ensure RPC doesn't contain malicious code + { + return thisRpc; + } } - return ""; + return null; } public boolean isMainNetsSelected() diff --git a/app/src/main/java/com/alphawallet/app/viewmodel/HomeViewModel.java b/app/src/main/java/com/alphawallet/app/viewmodel/HomeViewModel.java index f737f113e9..aa9e56c8c1 100644 --- a/app/src/main/java/com/alphawallet/app/viewmodel/HomeViewModel.java +++ b/app/src/main/java/com/alphawallet/app/viewmodel/HomeViewModel.java @@ -123,7 +123,6 @@ public class HomeViewModel extends BaseViewModel { private CryptoFunctions cryptoFunctions; private ParseMagicLink parser; - private final MutableLiveData installIntent = new MutableLiveData<>(); private final MutableLiveData walletName = new MutableLiveData<>(); private final MutableLiveData defaultWallet = new MutableLiveData<>(); private final MutableLiveData splashActivity = new MutableLiveData<>(); @@ -173,10 +172,6 @@ public LiveData transactions() { return transactions; } - public LiveData installIntent() { - return installIntent; - } - public LiveData backUpMessage() { return backUpMessage; } diff --git a/app/src/main/java/com/alphawallet/app/viewmodel/NewSettingsViewModel.java b/app/src/main/java/com/alphawallet/app/viewmodel/NewSettingsViewModel.java index 37ac4e09d8..3ae8cb2ec7 100644 --- a/app/src/main/java/com/alphawallet/app/viewmodel/NewSettingsViewModel.java +++ b/app/src/main/java/com/alphawallet/app/viewmodel/NewSettingsViewModel.java @@ -3,6 +3,7 @@ import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; + import android.content.Context; import com.alphawallet.app.entity.CurrencyItem; @@ -15,6 +16,7 @@ import com.alphawallet.app.repository.PreferenceRepositoryType; import com.alphawallet.app.router.ManageWalletsRouter; import com.alphawallet.app.router.MyAddressRouter; +import com.alphawallet.app.service.TickerService; import com.alphawallet.app.service.TransactionsService; import com.alphawallet.app.util.LocaleUtils; @@ -26,7 +28,8 @@ import io.reactivex.Single; @HiltViewModel -public class NewSettingsViewModel extends BaseViewModel { +public class NewSettingsViewModel extends BaseViewModel +{ private final MutableLiveData defaultWallet = new MutableLiveData<>(); private final MutableLiveData transactions = new MutableLiveData<>(); @@ -38,6 +41,7 @@ public class NewSettingsViewModel extends BaseViewModel { private final LocaleRepositoryType localeRepository; private final CurrencyRepositoryType currencyRepository; private final TransactionsService transactionsService; + private final TickerService tickerService; @Inject NewSettingsViewModel( @@ -47,7 +51,9 @@ public class NewSettingsViewModel extends BaseViewModel { PreferenceRepositoryType preferenceRepository, LocaleRepositoryType localeRepository, CurrencyRepositoryType currencyRepository, - TransactionsService transactionsService) { + TransactionsService transactionsService, + TickerService tickerService) + { this.genericWalletInteract = genericWalletInteract; this.myAddressRouter = myAddressRouter; this.manageWalletsRouter = manageWalletsRouter; @@ -55,32 +61,40 @@ public class NewSettingsViewModel extends BaseViewModel { this.localeRepository = localeRepository; this.currencyRepository = currencyRepository; this.transactionsService = transactionsService; + this.tickerService = tickerService; } - public ArrayList getLocaleList(Context context) { + public ArrayList getLocaleList(Context context) + { return localeRepository.getLocaleList(context); } - public void setLocale(Context activity) { + public void setLocale(Context activity) + { String currentLocale = localeRepository.getActiveLocale(); LocaleUtils.setLocale(activity, currentLocale); } - public void updateLocale(String newLocale, Context context) { + public void updateLocale(String newLocale, Context context) + { localeRepository.setUserPreferenceLocale(newLocale); localeRepository.setLocale(context, newLocale); } - public String getDefaultCurrency(){ + public String getDefaultCurrency() + { return currencyRepository.getDefaultCurrency(); } - public ArrayList getCurrencyList() { + public ArrayList getCurrencyList() + { return currencyRepository.getCurrencyList(); } - public Single updateCurrency(String currencyCode){ + public Single updateCurrency(String currencyCode) + { currencyRepository.setDefaultCurrency(currencyCode); + tickerService.updateCurrencyConversion(); //delete tickers from realm return transactionsService.wipeTickerData(); } @@ -90,7 +104,8 @@ public String getActiveLocale() return localeRepository.getActiveLocale(); } - public void showManageWallets(Context context, boolean clearStack) { + public void showManageWallets(Context context, boolean clearStack) + { manageWalletsRouter.open(context, clearStack); } @@ -98,32 +113,42 @@ public boolean getNotificationState() { return preferenceRepository.getNotificationsState(); } + public void setNotificationState(boolean notificationState) { preferenceRepository.setNotificationState(notificationState); } @Override - protected void onCleared() { + protected void onCleared() + { super.onCleared(); } - public LiveData defaultWallet() { + public LiveData defaultWallet() + { return defaultWallet; } - public LiveData transactions() { + public LiveData transactions() + { return transactions; } - public LiveData backUpMessage() { return backUpMessage; } - public void prepare() { + public LiveData backUpMessage() + { + return backUpMessage; + } + + public void prepare() + { disposable = genericWalletInteract .find() .subscribe(this::onDefaultWallet, this::onError); } - private void onDefaultWallet(Wallet wallet) { + private void onDefaultWallet(Wallet wallet) + { defaultWallet.setValue(wallet); TestWalletBackup(); @@ -138,7 +163,8 @@ public void TestWalletBackup() } } - public void showMyAddress(Context context) { + public void showMyAddress(Context context) + { myAddressRouter.open(context, defaultWallet.getValue()); } @@ -147,7 +173,13 @@ public void setIsDismissed(String walletAddr, boolean isDismissed) genericWalletInteract.setIsDismissed(walletAddr, isDismissed); } - public void setMarshMallowWarning(boolean shown) { - preferenceRepository.setMarshMallowWarning(shown); + public boolean hasShownAPI23Notification() + { + return preferenceRepository.hasCancelledAPI23Notification(); + } + + public void cancelAPI23Notification() + { + preferenceRepository.cancelAPI23Notification(); } } diff --git a/app/src/main/java/com/alphawallet/app/viewmodel/SelectRouteViewModel.java b/app/src/main/java/com/alphawallet/app/viewmodel/SelectRouteViewModel.java new file mode 100644 index 0000000000..4e2a7c5de5 --- /dev/null +++ b/app/src/main/java/com/alphawallet/app/viewmodel/SelectRouteViewModel.java @@ -0,0 +1,119 @@ +package com.alphawallet.app.viewmodel; + +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; + +import com.alphawallet.app.R; +import com.alphawallet.app.entity.lifi.Route; +import com.alphawallet.app.repository.PreferenceRepositoryType; +import com.alphawallet.app.service.SwapService; +import com.alphawallet.app.ui.widget.entity.ProgressInfo; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; + +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import java.util.List; +import java.util.Set; + +import javax.inject.Inject; + +import dagger.hilt.android.lifecycle.HiltViewModel; +import io.reactivex.android.schedulers.AndroidSchedulers; +import io.reactivex.disposables.Disposable; +import io.reactivex.schedulers.Schedulers; + +@HiltViewModel +public class SelectRouteViewModel extends BaseViewModel +{ + private final PreferenceRepositoryType preferenceRepository; + private final SwapService swapService; + private final MutableLiveData> routes = new MutableLiveData<>(); + private final MutableLiveData progressInfo = new MutableLiveData<>(); + private Disposable routeDisposable; + + @Inject + public SelectRouteViewModel( + PreferenceRepositoryType preferenceRepository, + SwapService swapService) + { + this.preferenceRepository = preferenceRepository; + this.swapService = swapService; + } + + public LiveData> routes() + { + return routes; + } + + public LiveData progressInfo() + { + return progressInfo; + } + + public void getRoutes(String fromChainId, + String toChainId, + String fromTokenAddress, + String toTokenAddress, + String fromAddress, + String fromAmount, + String slippage, + Set exchanges) + { + progressInfo.postValue(new ProgressInfo(true, R.string.message_fetching_routes)); + + routeDisposable = swapService + .getRoutes(fromChainId, toChainId, fromTokenAddress, toTokenAddress, fromAddress, fromAmount, slippage, exchanges) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(this::onRoutes, this::onRoutesError); + } + + private void onRoutes(String result) + { + progressInfo.postValue(new ProgressInfo(false)); + + try + { + JSONObject obj = new JSONObject(result); + if (obj.has("routes")) + { + JSONArray json = obj.getJSONArray("routes"); + List routeList = new Gson().fromJson(json.toString(), new TypeToken>() + { + }.getType()); + routes.postValue(routeList); + } + else + { +// postError(C.ErrorCode.SWAP_CONNECTIONS_ERROR, result); + } + } + catch (JSONException e) + { +// postError(C.ErrorCode.SWAP_CONNECTIONS_ERROR, Objects.requireNonNull(e.getMessage())); + } + } + + private void onRoutesError(Throwable throwable) + { + // TODO: + } + + public Set getPreferredExchanges() + { + return preferenceRepository.getSelectedSwapProviders(); + } + + @Override + protected void onCleared() + { + if (routeDisposable != null && !routeDisposable.isDisposed()) + { + routeDisposable.dispose(); + } + super.onCleared(); + } +} diff --git a/app/src/main/java/com/alphawallet/app/viewmodel/SelectSwapProvidersViewModel.java b/app/src/main/java/com/alphawallet/app/viewmodel/SelectSwapProvidersViewModel.java new file mode 100644 index 0000000000..e162683958 --- /dev/null +++ b/app/src/main/java/com/alphawallet/app/viewmodel/SelectSwapProvidersViewModel.java @@ -0,0 +1,85 @@ +package com.alphawallet.app.viewmodel; + +import android.content.Context; + +import com.alphawallet.app.entity.lifi.SwapProvider; +import com.alphawallet.app.repository.PreferenceRepositoryType; +import com.alphawallet.app.repository.SwapRepositoryType; + +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import javax.inject.Inject; + +import dagger.hilt.android.lifecycle.HiltViewModel; + +@HiltViewModel +public class SelectSwapProvidersViewModel extends BaseViewModel +{ + private final PreferenceRepositoryType preferenceRepository; + private final SwapRepositoryType swapRepository; + + @Inject + public SelectSwapProvidersViewModel( + PreferenceRepositoryType preferenceRepository, + SwapRepositoryType swapRepository) + { + this.preferenceRepository = preferenceRepository; + this.swapRepository = swapRepository; + } + + public Set getPreferredExchanges(Context context) + { + Set exchanges = preferenceRepository.getSelectedSwapProviders(); + if (exchanges.isEmpty()) + { + List swapProviders = getSwapProviders(); + if (swapProviders != null) + { + for (SwapProvider provider : swapProviders) + { + exchanges.add(provider.key); + } + preferenceRepository.setSelectedSwapProviders(exchanges); + } + } + return exchanges; + } + + public List getSwapProviders() + { + List swapProviders = swapRepository.getProviders(); + + if (swapProviders != null) + { + Set preferredProviders = preferenceRepository.getSelectedSwapProviders(); + for (SwapProvider provider : swapProviders) + { + if (preferredProviders.contains(provider.key)) + { + provider.isChecked = true; + } + } + } + + return swapProviders; + } + + public boolean savePreferences(List swapProviders) + { + Set stringSet = new HashSet<>(); + for (SwapProvider providerool : swapProviders) + { + if (providerool.isChecked) + { + stringSet.add(providerool.key); + } + } + if (!stringSet.isEmpty()) + { + preferenceRepository.setSelectedSwapProviders(stringSet); + } + return !stringSet.isEmpty(); + } +} diff --git a/app/src/main/java/com/alphawallet/app/viewmodel/SwapViewModel.java b/app/src/main/java/com/alphawallet/app/viewmodel/SwapViewModel.java index 2bcfcd2812..d3c2a55b4e 100644 --- a/app/src/main/java/com/alphawallet/app/viewmodel/SwapViewModel.java +++ b/app/src/main/java/com/alphawallet/app/viewmodel/SwapViewModel.java @@ -1,11 +1,14 @@ package com.alphawallet.app.viewmodel; import android.app.Activity; +import android.content.Intent; +import androidx.activity.result.ActivityResultLauncher; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import com.alphawallet.app.C; +import com.alphawallet.app.R; import com.alphawallet.app.entity.ErrorEnvelope; import com.alphawallet.app.entity.SignAuthenticationCallback; import com.alphawallet.app.entity.TransactionData; @@ -13,12 +16,18 @@ import com.alphawallet.app.entity.lifi.Chain; import com.alphawallet.app.entity.lifi.Connection; import com.alphawallet.app.entity.lifi.Quote; -import com.alphawallet.app.entity.tokens.Token; +import com.alphawallet.app.entity.lifi.SwapProvider; +import com.alphawallet.app.entity.lifi.Token; import com.alphawallet.app.interact.CreateTransactionInteract; +import com.alphawallet.app.repository.PreferenceRepositoryType; +import com.alphawallet.app.repository.SwapRepositoryType; import com.alphawallet.app.service.AssetDefinitionService; import com.alphawallet.app.service.KeyService; import com.alphawallet.app.service.SwapService; import com.alphawallet.app.service.TokensService; +import com.alphawallet.app.ui.SelectRouteActivity; +import com.alphawallet.app.ui.SelectSwapProvidersActivity; +import com.alphawallet.app.ui.widget.entity.ProgressInfo; import com.alphawallet.app.util.BalanceUtils; import com.alphawallet.app.util.Hex; import com.alphawallet.app.web3.entity.Address; @@ -35,6 +44,7 @@ import java.util.List; import java.util.Locale; import java.util.Objects; +import java.util.Set; import javax.inject.Inject; @@ -48,6 +58,8 @@ public class SwapViewModel extends BaseViewModel { private final AssetDefinitionService assetDefinitionService; + private final PreferenceRepositoryType preferenceRepository; + private final SwapRepositoryType swapRepository; private final TokensService tokensService; private final SwapService swapService; private final CreateTransactionInteract createTransactionInteract; @@ -58,7 +70,7 @@ public class SwapViewModel extends BaseViewModel private final MutableLiveData> connections = new MutableLiveData<>(); private final MutableLiveData quote = new MutableLiveData<>(); private final MutableLiveData network = new MutableLiveData<>(); - private final MutableLiveData progressInfo = new MutableLiveData<>(); + private final MutableLiveData progressInfo = new MutableLiveData<>(); private final MutableLiveData transactionFinalised = new MutableLiveData<>(); private final MutableLiveData transactionError = new MutableLiveData<>(); @@ -70,12 +82,16 @@ public class SwapViewModel extends BaseViewModel @Inject public SwapViewModel( AssetDefinitionService assetDefinitionService, + PreferenceRepositoryType preferenceRepository, + SwapRepositoryType swapRepository, TokensService tokensService, SwapService swapService, CreateTransactionInteract createTransactionInteract, KeyService keyService) { this.assetDefinitionService = assetDefinitionService; + this.preferenceRepository = preferenceRepository; + this.swapRepository = swapRepository; this.tokensService = tokensService; this.swapService = swapService; this.createTransactionInteract = createTransactionInteract; @@ -117,7 +133,7 @@ public LiveData network() return network; } - public LiveData progressInfo() + public LiveData progressInfo() { return progressInfo; } @@ -144,8 +160,7 @@ public void setChain(Chain c) public void getChains() { - progressInfo.postValue(C.ProgressInfo.FETCHING_CHAINS); - progress.postValue(true); + progressInfo.postValue(new ProgressInfo(true, R.string.message_fetching_chains)); chainsDisposable = swapService.getChains() .subscribeOn(Schedulers.io()) @@ -153,10 +168,23 @@ public void getChains() .subscribe(this::onChains, this::onChainsError); } + public String getSwapProviderUrl(String key) + { + List tools = getSwapProviders(); + for (SwapProvider td : tools) + { + if (key.startsWith(td.key)) + { + return td.url; + } + } + + return ""; + } + public void getConnections(long from, long to) { - progressInfo.postValue(C.ProgressInfo.FETCHING_CONNECTIONS); - progress.postValue(true); + progressInfo.postValue(new ProgressInfo(true, R.string.message_fetching_connections)); connectionsDisposable = swapService.getConnections(from, to) .subscribeOn(Schedulers.io()) @@ -164,14 +192,14 @@ public void getConnections(long from, long to) .subscribe(this::onConnections, this::onConnectionsError); } - public void getQuote(Connection.LToken source, Connection.LToken dest, String address, String amount, String slippage) + public void getQuote(Token source, Token dest, String address, String amount, String slippage, String allowExchanges) { + if (!isValidAmount(amount)) return; if (hasEnoughBalance(source, amount)) { - progressInfo.postValue(C.ProgressInfo.FETCHING_QUOTE); - progress.postValue(true); + progressInfo.postValue(new ProgressInfo(true, R.string.message_fetching_quote)); - quoteDisposable = swapService.getQuote(source, dest, address, amount, slippage) + quoteDisposable = swapService.getQuote(source, dest, address, amount, slippage, allowExchanges) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(this::onQuote, this::onQuoteError); @@ -182,6 +210,19 @@ public void getQuote(Connection.LToken source, Connection.LToken dest, String ad } } + private boolean isValidAmount(String amount) + { + try + { + BigDecimal d = new BigDecimal(amount); + } + catch (Exception e) + { + return false; + } + return true; + } + private void onChainsError(Throwable t) { postError(C.ErrorCode.SWAP_CHAIN_ERROR, Objects.requireNonNull(t.getMessage())); @@ -197,7 +238,7 @@ private void onQuoteError(Throwable t) postError(C.ErrorCode.SWAP_QUOTE_ERROR, Objects.requireNonNull(t.getMessage())); } - public boolean hasEnoughBalance(Connection.LToken source, String amount) + public boolean hasEnoughBalance(Token source, String amount) { BigDecimal bal = new BigDecimal(getBalance(source)); BigDecimal reqAmount = new BigDecimal(amount); @@ -255,7 +296,7 @@ private void onConnections(String result) postError(C.ErrorCode.SWAP_CONNECTIONS_ERROR, Objects.requireNonNull(e.getMessage())); } - progress.postValue(false); + progressInfo.postValue(new ProgressInfo(false)); } private void onQuote(String result) @@ -270,7 +311,7 @@ private void onQuote(String result) quote.postValue(q); } - progress.postValue(false); + progressInfo.postValue(new ProgressInfo(false)); } private void postError(int errorCode, String errorStr) @@ -308,9 +349,9 @@ private boolean isValidQuote(String result) && result.contains("tool"); } - public String getBalance(Connection.LToken token) + public String getBalance(Token token) { - Token t; + com.alphawallet.app.entity.tokens.Token t; if (token.isNativeToken()) { t = tokensService.getServiceToken(token.chainId); @@ -360,6 +401,16 @@ public Web3Transaction buildWeb3Transaction(Quote quote) ); } + public List getSwapProviders() + { + return swapRepository.getProviders(); + } + + public Set getPreferredSwapProviders() + { + return preferenceRepository.getSelectedSwapProviders(); + } + @Override protected void onCleared() { @@ -381,4 +432,48 @@ protected void onCleared() } super.onCleared(); } + + public void getRoutes(Activity activity, + ActivityResultLauncher launcher, + Token source, + Token dest, + String address, + String amount, + String slippage) + { + if (!isValidAmount(amount)) return; + if (hasEnoughBalance(source, amount)) + { + Intent intent = new Intent(activity, SelectRouteActivity.class); + intent.putExtra("fromChainId", String.valueOf(source.chainId)); + intent.putExtra("toChainId", String.valueOf(dest.chainId)); + intent.putExtra("fromTokenAddress", String.valueOf(source.address)); + intent.putExtra("toTokenAddress", String.valueOf(dest.address)); + intent.putExtra("fromAddress", address); + intent.putExtra("fromAmount", BalanceUtils.getRawFormat(amount, source.decimals)); + intent.putExtra("fromTokenDecimals", source.decimals); + intent.putExtra("slippage", slippage); + intent.putExtra("fromTokenSymbol", source.symbol); + intent.putExtra("fromTokenIcon", source.symbol); + intent.putExtra("fromTokenLogoUri", source.logoURI); + launcher.launch(intent); + } + else + { + error.postValue(new ErrorEnvelope(C.ErrorCode.INSUFFICIENT_BALANCE, "")); + } + } + + public void prepare(Activity activity, ActivityResultLauncher launcher) + { + if (getPreferredSwapProviders().isEmpty()) + { + Intent intent = new Intent(activity, SelectSwapProvidersActivity.class); + launcher.launch(intent); + } + else + { + getChains(); + } + } } diff --git a/app/src/main/java/com/alphawallet/app/viewmodel/TokenFunctionViewModel.java b/app/src/main/java/com/alphawallet/app/viewmodel/TokenFunctionViewModel.java index 2bcbc4ea20..679d49ba3d 100644 --- a/app/src/main/java/com/alphawallet/app/viewmodel/TokenFunctionViewModel.java +++ b/app/src/main/java/com/alphawallet/app/viewmodel/TokenFunctionViewModel.java @@ -892,4 +892,9 @@ private void onAsset(String result, Token token, BigInteger tokenId) getTokenMetadata(token, tokenId, oldAsset); } } + + public String getBrowserRPC(long chainId) + { + return ethereumNetworkRepository.getDappBrowserRPC(chainId); + } } diff --git a/app/src/main/java/com/alphawallet/app/viewmodel/Tokens.java b/app/src/main/java/com/alphawallet/app/viewmodel/Tokens.java index cd4367823d..07689b8646 100644 --- a/app/src/main/java/com/alphawallet/app/viewmodel/Tokens.java +++ b/app/src/main/java/com/alphawallet/app/viewmodel/Tokens.java @@ -1,6 +1,6 @@ package com.alphawallet.app.viewmodel; -import com.alphawallet.app.entity.lifi.Connection; +import com.alphawallet.app.entity.lifi.Token; import java.math.BigDecimal; import java.util.Collections; @@ -8,7 +8,7 @@ public class Tokens { - public static void sortValue(List tokenItems) + public static void sortValue(List tokenItems) { Collections.sort(tokenItems, (l, r) -> { if (l.isNativeToken()) @@ -28,7 +28,7 @@ else if (r.isNativeToken()) }); } - public static void sortName(List tokenItems) + public static void sortName(List tokenItems) { Collections.sort(tokenItems, (l, r) -> { if (l.isNativeToken()) @@ -41,7 +41,7 @@ else if (r.isNativeToken()) } else { - return l.name.compareToIgnoreCase(r.name); + return l.name.trim().compareToIgnoreCase(r.name.trim()); } }); } diff --git a/app/src/main/java/com/alphawallet/app/viewmodel/TransactionDetailViewModel.java b/app/src/main/java/com/alphawallet/app/viewmodel/TransactionDetailViewModel.java index 8e27b14b8d..9d07c4c50e 100644 --- a/app/src/main/java/com/alphawallet/app/viewmodel/TransactionDetailViewModel.java +++ b/app/src/main/java/com/alphawallet/app/viewmodel/TransactionDetailViewModel.java @@ -233,7 +233,7 @@ private void storeTx(EthTransaction rawTx, Wallet wallet, long chainId, Web3j we return; } - org.web3j.protocol.core.methods.response.Transaction ethTx = rawTx.getTransaction().get(); + org.web3j.protocol.core.methods.response.Transaction ethTx = rawTx.getTransaction(); // no Optional<> in API23 disposable = EventUtils.getBlockDetails(ethTx.getBlockHash(), web3j) .map(ethBlock -> new Transaction(ethTx, chainId, true, ethBlock.getBlock().getTimestamp().longValue())) .map(tx -> writeTransaction(wallet, tx)) diff --git a/app/src/main/java/com/alphawallet/app/viewmodel/WalletViewModel.java b/app/src/main/java/com/alphawallet/app/viewmodel/WalletViewModel.java index 848e236d89..189c022bff 100644 --- a/app/src/main/java/com/alphawallet/app/viewmodel/WalletViewModel.java +++ b/app/src/main/java/com/alphawallet/app/viewmodel/WalletViewModel.java @@ -1,7 +1,6 @@ package com.alphawallet.app.viewmodel; import static com.alphawallet.app.C.EXTRA_ADDRESS; -import static com.alphawallet.app.repository.TokensRealmSource.databaseKey; import static com.alphawallet.app.widget.CopyTextView.KEY_ADDRESS; import android.app.Activity; @@ -40,7 +39,7 @@ import com.alphawallet.app.service.RealmManager; import com.alphawallet.app.service.TokensService; import com.alphawallet.app.ui.NameThisWalletActivity; -import com.alphawallet.app.ui.QRScanning.QRScanner; +import com.alphawallet.app.ui.QRScanning.QRScannerActivity; import com.alphawallet.app.ui.TokenManagementActivity; import com.alphawallet.app.widget.WalletFragmentActionsView; import com.google.android.material.bottomsheet.BottomSheetBehavior; @@ -50,7 +49,6 @@ import org.web3j.crypto.Keys; import java.math.BigDecimal; -import java.util.ArrayList; import javax.inject.Inject; @@ -266,7 +264,7 @@ public void showMyAddress(Context context) } public void showQRCodeScanning(Activity activity) { - Intent intent = new Intent(activity, QRScanner.class); + Intent intent = new Intent(activity, QRScannerActivity.class); intent.putExtra(C.EXTRA_UNIVERSAL_SCAN, true); activity.startActivityForResult(intent, C.REQUEST_UNIVERSAL_SCAN); } @@ -302,13 +300,16 @@ public void showTokenDetail(Activity activity, Token token) break; case ERC721: - case ERC875_LEGACY: - case ERC875: case ERC721_LEGACY: case ERC721_TICKET: case ERC721_UNDETERMINED: case ERC721_ENUMERABLE: - tokenDetailRouter.open(activity, token, defaultWallet.getValue(), false); //TODO: Fold this into tokenDetailRouter + tokenDetailRouter.open(activity, token, defaultWallet.getValue(), false); + break; + + case ERC875_LEGACY: + case ERC875: + tokenDetailRouter.openLegacyToken(activity, token, defaultWallet.getValue()); break; case NOT_SET: diff --git a/app/src/main/java/com/alphawallet/app/walletconnect/WCClient.kt b/app/src/main/java/com/alphawallet/app/walletconnect/WCClient.kt index 0eb706ad90..53ac1bfd10 100644 --- a/app/src/main/java/com/alphawallet/app/walletconnect/WCClient.kt +++ b/app/src/main/java/com/alphawallet/app/walletconnect/WCClient.kt @@ -408,6 +408,7 @@ open class WCClient : WebSocketListener() { WCMethod.ADD_ETHEREUM_CHAIN -> { handleAddChain(request) } + else -> {} } } diff --git a/app/src/main/java/com/alphawallet/app/web3/Web3TokenView.java b/app/src/main/java/com/alphawallet/app/web3/Web3TokenView.java index f48d1f2192..923fa2918a 100644 --- a/app/src/main/java/com/alphawallet/app/web3/Web3TokenView.java +++ b/app/src/main/java/com/alphawallet/app/web3/Web3TokenView.java @@ -35,7 +35,6 @@ import com.alphawallet.app.entity.tokens.Token; import com.alphawallet.app.entity.tokenscript.TokenScriptRenderCallback; import com.alphawallet.app.entity.tokenscript.WebCompletionCallback; -import com.alphawallet.app.repository.EthereumNetworkRepository; import com.alphawallet.app.repository.entity.RealmAuxData; import com.alphawallet.app.service.AssetDefinitionService; import com.alphawallet.app.util.Utils; @@ -239,8 +238,8 @@ public void setChainId(long chainId) { jsInjectorClient.setChainId(chainId); } - public void setRpcUrl(@NonNull long chainId) { - jsInjectorClient.setRpcUrl(EthereumNetworkRepository.getDefaultNodeURL(chainId)); + public void setRpcUrl(@NonNull String useRPC) { + jsInjectorClient.setRpcUrl(useRPC); } public void onSignPersonalMessageSuccessful(@NotNull Signable message, String signHex) { diff --git a/app/src/main/java/com/alphawallet/app/web3/Web3View.java b/app/src/main/java/com/alphawallet/app/web3/Web3View.java index 91f774f712..9669d20355 100644 --- a/app/src/main/java/com/alphawallet/app/web3/Web3View.java +++ b/app/src/main/java/com/alphawallet/app/web3/Web3View.java @@ -1,11 +1,7 @@ package com.alphawallet.app.web3; -import static androidx.webkit.WebSettingsCompat.FORCE_DARK_OFF; -import static androidx.webkit.WebSettingsCompat.FORCE_DARK_ON; - import android.annotation.SuppressLint; import android.content.Context; -import android.content.res.Configuration; import android.graphics.Bitmap; import android.os.Build; import android.util.AttributeSet; @@ -19,8 +15,6 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; -import androidx.webkit.WebSettingsCompat; -import androidx.webkit.WebViewFeature; import com.alphawallet.app.BuildConfig; import com.alphawallet.app.entity.URLLoadInterface; @@ -35,6 +29,8 @@ import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; +import java.net.MalformedURLException; +import java.net.URL; import java.util.HashMap; import java.util.Map; @@ -380,7 +376,7 @@ else if (!loadingError && loadInterface != null) @Override public boolean shouldOverrideUrlLoading(WebView view, String url) { - redirect = true; + redirect = isRedirect(view, url); return externalClient.shouldOverrideUrlLoading(view, url) || internalClient.shouldOverrideUrlLoading(view, url); @@ -398,10 +394,42 @@ public void onReceivedError(WebView view, WebResourceRequest request, WebResourc @Override public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) { - redirect = true; + redirect = isRedirect(view, request); return externalClient.shouldOverrideUrlLoading(view, request) || internalClient.shouldOverrideUrlLoading(view, request); } + + private boolean isRedirect(WebView view, String url) + { + try + { + return isRedirect(new URL(view.getUrl()), new URL(url)); + } + catch (MalformedURLException e) + { + return true; + } + } + + private boolean isRedirect(WebView view, WebResourceRequest request) + { + try + { + return isRedirect(new URL(view.getUrl()), new URL(request.toString())); + } + catch (MalformedURLException e) + { + return true; + } + } + + private boolean isRedirect(URL urlSource, URL urlDestination) + { + String sourceBase = urlSource.getHost(); + String destinationBase = urlDestination.getHost(); + + return !sourceBase.equals(destinationBase) || urlSource.toString().equals(urlDestination.toString()); + } } } diff --git a/app/src/main/java/com/alphawallet/app/web3j/ens/NameHash.java b/app/src/main/java/com/alphawallet/app/web3j/ens/NameHash.java index 6f50e4ce7d..9cba55aef4 100644 --- a/app/src/main/java/com/alphawallet/app/web3j/ens/NameHash.java +++ b/app/src/main/java/com/alphawallet/app/web3j/ens/NameHash.java @@ -12,6 +12,11 @@ */ package com.alphawallet.app.web3j.ens; +import android.text.TextUtils; + +import org.web3j.crypto.Hash; +import org.web3j.utils.Numeric; + import java.io.ByteArrayOutputStream; import java.io.IOException; import java.net.IDN; @@ -19,9 +24,6 @@ import java.util.Arrays; import java.util.Locale; -import org.web3j.crypto.Hash; -import org.web3j.utils.Numeric; - /** ENS name hash implementation. */ public class NameHash { @@ -65,10 +67,18 @@ private static byte[] nameHash(String[] labels) { * @return normalised ens name * @throws EnsResolutionException if the name cannot be normalised */ - public static String normalise(String ensName) { - try { + public static String normalise(String ensName) + { + if (TextUtils.isEmpty(ensName)) + { + return ""; + } + try + { return IDN.toASCII(ensName, IDN.USE_STD3_ASCII_RULES).toLowerCase(Locale.ROOT); - } catch (IllegalArgumentException e) { + } + catch (Exception e) + { throw new EnsResolutionException("Invalid ENS name provided: " + ensName); } } @@ -88,13 +98,20 @@ public static byte[] toUtf8Bytes(String string) { * @return Encoded name in Hex format. * @throws IOException */ - public static String dnsEncode(String name) throws IOException { + public static String dnsEncode(String name) throws IOException + { String[] parts = name.split("\\."); ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - for (String part : parts) { + for (String part : parts) + { + if (TextUtils.isEmpty(part)) + { + break; + } byte[] bytes = toUtf8Bytes("_" + normalise(part)); - if (bytes == null) { + if (bytes == null) + { break; } bytes[0] = (byte) (bytes.length - 1); diff --git a/app/src/main/java/com/alphawallet/app/widget/AddressDetailView.java b/app/src/main/java/com/alphawallet/app/widget/AddressDetailView.java index c9c6c5069e..688d5de6a8 100644 --- a/app/src/main/java/com/alphawallet/app/widget/AddressDetailView.java +++ b/app/src/main/java/com/alphawallet/app/widget/AddressDetailView.java @@ -57,7 +57,8 @@ private void getAttrs(Context context, AttributeSet attrs) public void setupAddress(String address, String ensName, Token destToken) { - String destStr = (!TextUtils.isEmpty(ensName) ? ensName + " | " : "") + Utils.formatAddress(address); + boolean hasEns = !TextUtils.isEmpty(ensName); + String destStr = (hasEns ? ensName + " | " : "") + (hasEns ? Utils.formatAddress(address) : address); textAddressSummary.setText(destStr); userAvatar.bind(new Wallet(address), wallet -> { /*NOP, here to enable lookup of ENS avatar*/ }); textFullAddress.setText(address); diff --git a/app/src/main/java/com/alphawallet/app/widget/CopyTextView.java b/app/src/main/java/com/alphawallet/app/widget/CopyTextView.java index b07fdf4aae..a6ae83075d 100644 --- a/app/src/main/java/com/alphawallet/app/widget/CopyTextView.java +++ b/app/src/main/java/com/alphawallet/app/widget/CopyTextView.java @@ -14,8 +14,8 @@ import com.alphawallet.app.R; import com.google.android.material.button.MaterialButton; -public class CopyTextView extends LinearLayout { - +public class CopyTextView extends LinearLayout +{ public static final String KEY_ADDRESS = "key_address"; private final Context context; @@ -23,6 +23,7 @@ public class CopyTextView extends LinearLayout { private int textResId; private int gravity; + private int lines; private boolean showToast; private boolean boldFont; private boolean removePadding; @@ -56,6 +57,7 @@ private void getAttrs(Context context, AttributeSet attrs) boldFont = a.getBoolean(R.styleable.CopyTextView_bold, false); removePadding = a.getBoolean(R.styleable.CopyTextView_removePadding, false); marginRight = a.getDimension(R.styleable.CopyTextView_marginRight, 0.0f); + lines = a.getInt(R.styleable.CopyTextView_lines, 1); } finally { @@ -65,7 +67,17 @@ private void getAttrs(Context context, AttributeSet attrs) private void bindViews() { - button = findViewById(R.id.button); + if (lines == 2) + { + button = findViewById(R.id.button_address); + findViewById(R.id.button).setVisibility(View.GONE); + button.setVisibility(View.VISIBLE); + } + else + { + button = findViewById(R.id.button); + } + setText(getContext().getString(textResId)); button.setOnClickListener(v -> copyToClipboard()); } @@ -98,6 +110,8 @@ private void copyToClipboard() } if (showToast) + { Toast.makeText(context, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show(); + } } } diff --git a/app/src/main/java/com/alphawallet/app/widget/GasWidget.java b/app/src/main/java/com/alphawallet/app/widget/GasWidget.java index 49cd808292..854d5eac88 100644 --- a/app/src/main/java/com/alphawallet/app/widget/GasWidget.java +++ b/app/src/main/java/com/alphawallet/app/widget/GasWidget.java @@ -38,6 +38,7 @@ import io.realm.Realm; import io.realm.RealmQuery; +import timber.log.Timber; /** * Created by JB on 19/11/2020. @@ -318,6 +319,11 @@ public void run() { GasSpeed2 gs = gasSpread.getSelectedGasFee(currentGasSpeedIndex); + if (gs == null || gs.gasPrice == null || gs.gasPrice.maxFeePerGas == null) + { + return; + } + Token baseCurrency = tokensService.getTokenOrBase(token.tokenInfo.chainId, token.getWallet()); BigInteger networkFee = gs.gasPrice.maxFeePerGas.multiply(getUseGasLimit()); String gasAmountInBase = BalanceUtils.getSlidingBaseValue(new BigDecimal(networkFee), baseCurrency.tokenInfo.decimals, GasSettingsActivity.GAS_PRECISION); @@ -349,7 +355,7 @@ public void run() } catch (Exception e) { - // + Timber.w(e); } timeEstimate.setText(displayStr); speedText.setText(gs.speed); diff --git a/app/src/main/java/com/alphawallet/app/widget/InputAddress.java b/app/src/main/java/com/alphawallet/app/widget/InputAddress.java index fd66ad3393..cfe2425d11 100644 --- a/app/src/main/java/com/alphawallet/app/widget/InputAddress.java +++ b/app/src/main/java/com/alphawallet/app/widget/InputAddress.java @@ -25,7 +25,7 @@ import com.alphawallet.app.R; import com.alphawallet.app.entity.ENSCallback; import com.alphawallet.app.entity.Wallet; -import com.alphawallet.app.ui.QRScanning.QRScanner; +import com.alphawallet.app.ui.QRScanning.QRScannerActivity; import com.alphawallet.app.ui.widget.adapter.AutoCompleteAddressAdapter; import com.alphawallet.app.ui.widget.entity.AddressReadyCallback; import com.alphawallet.app.ui.widget.entity.BoxStatus; @@ -189,7 +189,7 @@ private void setViews() { //QR Scanner scanQrIcon.setOnClickListener(v -> { - Intent intent = new Intent(context, QRScanner.class); + Intent intent = new Intent(context, QRScannerActivity.class); intent.putExtra(C.EXTRA_CHAIN_ID, chainOverride); ((Activity) context).startActivityForResult(intent, C.BARCODE_READER_REQUEST_CODE); }); diff --git a/app/src/main/java/com/alphawallet/app/widget/InputAmount.java b/app/src/main/java/com/alphawallet/app/widget/InputAmount.java index 4d49ba8deb..a5e0d957ec 100644 --- a/app/src/main/java/com/alphawallet/app/widget/InputAmount.java +++ b/app/src/main/java/com/alphawallet/app/widget/InputAmount.java @@ -36,6 +36,9 @@ import java.math.RoundingMode; import java.text.DecimalFormat; +import io.reactivex.Completable; +import io.reactivex.android.schedulers.AndroidSchedulers; +import io.reactivex.schedulers.Schedulers; import io.realm.Case; import io.realm.Realm; import io.realm.RealmQuery; @@ -396,9 +399,23 @@ private void setupAllFunds() { gasFetch.setVisibility(View.VISIBLE); Web3j web3j = TokenRepository.getWeb3jService(token.tokenInfo.chainId); - web3j.ethGasPrice().sendAsync() - .thenAccept(ethGasPrice -> onLatestGasPrice(ethGasPrice.getGasPrice())) - .exceptionally(this::onGasFetchError); + Completable.fromRunnable(() -> + { + try + { + onLatestGasPrice(web3j.ethGasPrice().sendAsync().get().getGasPrice()); + } + catch (Exception e) + { + e.printStackTrace(); + onGasFetchError(e); + } + } + ) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(() -> {}, this::onGasFetchError) + .isDisposed(); } } else diff --git a/app/src/main/java/com/alphawallet/app/widget/InputView.java b/app/src/main/java/com/alphawallet/app/widget/InputView.java index 7ed64226fc..062209764b 100644 --- a/app/src/main/java/com/alphawallet/app/widget/InputView.java +++ b/app/src/main/java/com/alphawallet/app/widget/InputView.java @@ -7,7 +7,6 @@ import android.content.res.TypedArray; import android.text.TextUtils; import android.util.AttributeSet; -import android.util.Log; import android.view.Gravity; import android.view.View; import android.view.inputmethod.EditorInfo; @@ -18,7 +17,7 @@ import android.widget.TextView; import com.alphawallet.app.C; -import com.alphawallet.app.ui.QRScanning.QRScanner; +import com.alphawallet.app.ui.QRScanning.QRScannerActivity; import com.alphawallet.app.ui.widget.entity.BoxStatus; import com.alphawallet.app.util.Utils; @@ -113,7 +112,7 @@ private void getAttrs(Context context, AttributeSet attrs) { if (!noCam) { scanQrIcon.setOnClickListener(v -> { - Intent intent = new Intent(context, QRScanner.class); + Intent intent = new Intent(context, QRScannerActivity.class); ((Activity) context).startActivityForResult(intent, C.BARCODE_READER_REQUEST_CODE); }); } diff --git a/app/src/main/java/com/alphawallet/app/widget/SelectTokenDialog.java b/app/src/main/java/com/alphawallet/app/widget/SelectTokenDialog.java index c98fb66881..bc2ce27ba8 100644 --- a/app/src/main/java/com/alphawallet/app/widget/SelectTokenDialog.java +++ b/app/src/main/java/com/alphawallet/app/widget/SelectTokenDialog.java @@ -19,7 +19,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.alphawallet.app.R; -import com.alphawallet.app.entity.lifi.Connection; +import com.alphawallet.app.entity.lifi.Token; import com.alphawallet.app.ui.widget.adapter.SelectTokenAdapter; import com.google.android.material.bottomsheet.BottomSheetBehavior; import com.google.android.material.bottomsheet.BottomSheetDialog; @@ -56,7 +56,7 @@ public SelectTokenDialog(@NonNull Activity activity) btnClose.setOnClickListener(v -> dismiss()); } - public SelectTokenDialog(List tokenItems, Activity activity, SelectTokenDialogEventListener callback) + public SelectTokenDialog(List tokenItems, Activity activity, SelectTokenDialogEventListener callback) { this(activity); @@ -102,6 +102,6 @@ public void setSelectedToken(String address) public interface SelectTokenDialogEventListener { - void onChainSelected(Connection.LToken tokenItem); + void onChainSelected(Token tokenItem); } } diff --git a/app/src/main/java/com/alphawallet/app/widget/StandardHeader.java b/app/src/main/java/com/alphawallet/app/widget/StandardHeader.java index 0eb01a7490..2cd0a27315 100644 --- a/app/src/main/java/com/alphawallet/app/widget/StandardHeader.java +++ b/app/src/main/java/com/alphawallet/app/widget/StandardHeader.java @@ -4,6 +4,7 @@ import android.content.res.TypedArray; import android.util.AttributeSet; import android.view.View; +import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; @@ -16,6 +17,8 @@ public class StandardHeader extends LinearLayout { private TextView headerText; + private TextView textControl; + private ImageView imageControl; private ChainName chainName; private SwitchMaterial switchMaterial; private View separator; @@ -40,30 +43,41 @@ private void getAttrs(Context context, AttributeSet attrs) int headerId = a.getResourceId(R.styleable.StandardHeader_headerText, R.string.empty); boolean showSwitch = a.getBoolean(R.styleable.StandardHeader_showSwitch, false); boolean showChainName = a.getBoolean(R.styleable.StandardHeader_showChain, false); + boolean showTextControl = a.getBoolean(R.styleable.StandardHeader_showTextControl, false); + boolean showImageControl = a.getBoolean(R.styleable.StandardHeader_showImageControl, false); + int controlText = a.getResourceId(R.styleable.StandardHeader_controlText, -1); + int controlImageRes = a.getResourceId(R.styleable.StandardHeader_controlImageRes, -1); headerText = findViewById(R.id.text_header); chainName = findViewById(R.id.chain_name); switchMaterial = findViewById(R.id.switch_material); separator = findViewById(R.id.separator); + textControl = findViewById(R.id.text_control); + imageControl = findViewById(R.id.image_control); headerText.setText(headerId); - if (showSwitch) + switchMaterial.setVisibility(showSwitch ? View.VISIBLE : View.GONE); + chainName.setVisibility(showChainName ? View.VISIBLE : View.GONE); + + if (showTextControl) { - switchMaterial.setVisibility(View.VISIBLE); + textControl.setVisibility(View.VISIBLE); + textControl.setText(controlText); } else { - switchMaterial.setVisibility(View.GONE); + textControl.setVisibility(View.GONE); } - if (showChainName) + if (showImageControl) { - chainName.setVisibility(View.VISIBLE); + imageControl.setVisibility(View.VISIBLE); + imageControl.setImageResource(controlImageRes); } else { - chainName.setVisibility(View.GONE); + imageControl.setVisibility(View.GONE); } } finally @@ -92,6 +106,16 @@ public SwitchMaterial getSwitch() return switchMaterial; } + public TextView getTextControl() + { + return textControl; + } + + public ImageView getImageControl() + { + return imageControl; + } + public void hideSeparator() { separator.setVisibility(View.GONE); diff --git a/app/src/main/java/com/alphawallet/app/widget/SwapSettingsDialog.java b/app/src/main/java/com/alphawallet/app/widget/SwapSettingsDialog.java index 0f17a299f6..1ae6da13e5 100644 --- a/app/src/main/java/com/alphawallet/app/widget/SwapSettingsDialog.java +++ b/app/src/main/java/com/alphawallet/app/widget/SwapSettingsDialog.java @@ -3,9 +3,11 @@ import static com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED; import android.app.Activity; +import android.content.Intent; import android.content.res.Resources; import android.view.View; import android.widget.ImageView; +import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.LinearLayoutManager; @@ -13,19 +15,25 @@ import com.alphawallet.app.R; import com.alphawallet.app.entity.lifi.Chain; +import com.alphawallet.app.entity.lifi.SwapProvider; +import com.alphawallet.app.ui.SelectSwapProvidersActivity; import com.alphawallet.app.ui.widget.adapter.ChainFilter; import com.alphawallet.app.ui.widget.adapter.SelectChainAdapter; +import com.google.android.flexbox.FlexboxLayout; import com.google.android.material.bottomsheet.BottomSheetBehavior; import com.google.android.material.bottomsheet.BottomSheetDialog; import java.util.List; +import java.util.Set; public class SwapSettingsDialog extends BottomSheetDialog { private RecyclerView chainList; private SelectChainAdapter adapter; - private List chains; + private List swapProviders; private SlippageWidget slippageWidget; + private StandardHeader preferredExchangesHeader; + private FlexboxLayout preferredSwapProviders; public SwapSettingsDialog(@NonNull Activity activity) { @@ -35,7 +43,7 @@ public SwapSettingsDialog(@NonNull Activity activity) setOnShowListener(dialogInterface -> { view.setMinimumHeight(Resources.getSystem().getDisplayMetrics().heightPixels); - BottomSheetBehaviorbehavior = BottomSheetBehavior.from((View) view.getParent()); + BottomSheetBehavior behavior = BottomSheetBehavior.from((View) view.getParent()); behavior.setState(STATE_EXPANDED); behavior.setSkipCollapsed(true); }); @@ -45,15 +53,55 @@ public SwapSettingsDialog(@NonNull Activity activity) ImageView closeBtn = findViewById(R.id.image_close); closeBtn.setOnClickListener(v -> dismiss()); + + preferredExchangesHeader = findViewById(R.id.header_exchanges); + preferredExchangesHeader.getTextControl().setOnClickListener(v -> { + Intent intent = new Intent(activity, SelectSwapProvidersActivity.class); + activity.startActivity(intent); + }); + + preferredSwapProviders = findViewById(R.id.layout_exchanges); } - public SwapSettingsDialog(Activity activity, List chains, SwapSettingsInterface swapSettingsInterface) + public SwapSettingsDialog(Activity activity, + List chains, + List swapProviders, + Set preferredSwapProviders, + SwapSettingsInterface swapSettingsInterface) { this(activity); ChainFilter filter = new ChainFilter(chains); adapter = new SelectChainAdapter(activity, filter.getSupportedChains(), swapSettingsInterface); chainList.setLayoutManager(new LinearLayoutManager(getContext())); chainList.setAdapter(adapter); + this.swapProviders = swapProviders; + setSwapProviders(preferredSwapProviders); + } + + private TextView createTextView(String name) + { + int margin = (int) getContext().getResources().getDimension(R.dimen.tiny_8); + FlexboxLayout.LayoutParams params = + new FlexboxLayout.LayoutParams(FlexboxLayout.LayoutParams.WRAP_CONTENT, FlexboxLayout.LayoutParams.WRAP_CONTENT); + params.setMargins(margin, margin, margin, margin); + + TextView exchange = new TextView(getContext(), null); + exchange.setText(name); + exchange.setLayoutParams(params); + return exchange; + } + + public void setSwapProviders(Set swapProviders) + { + preferredSwapProviders.removeAllViews(); + for (SwapProvider provider : this.swapProviders) + { + if (swapProviders.contains(provider.key)) + { + preferredSwapProviders.addView(createTextView(provider.name)); + } + } + preferredSwapProviders.invalidate(); } public void setChains(List chains) diff --git a/app/src/main/java/com/alphawallet/app/widget/TokenIcon.java b/app/src/main/java/com/alphawallet/app/widget/TokenIcon.java index 1d1fb5759a..e523c2034c 100644 --- a/app/src/main/java/com/alphawallet/app/widget/TokenIcon.java +++ b/app/src/main/java/com/alphawallet/app/widget/TokenIcon.java @@ -4,6 +4,8 @@ import android.content.Context; import android.content.res.TypedArray; +import android.graphics.ColorMatrix; +import android.graphics.ColorMatrixColorFilter; import android.graphics.drawable.Drawable; import android.os.Handler; import android.os.Looper; @@ -353,10 +355,6 @@ public boolean onResourceReady(Drawable resource, Object model, Target public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) { if (model == null || token == null || !model.toString().toLowerCase().contains(token.getAddress())) return false; - if (token != null) - { - IconItem.noIconFound(token.tokenInfo.chainId, token.getAddress()); //don't try to load this asset again for this session - } return false; } @@ -398,4 +396,21 @@ private void loadImageFromResource(int resourceId) icon.setVisibility(View.VISIBLE); findViewById(R.id.circle).setVisibility(View.VISIBLE); } + + public void setGrayscale(boolean grayscale) + { + if (grayscale) + { + ColorMatrix matrix = new ColorMatrix(); + matrix.setSaturation(0); + ColorMatrixColorFilter cf = new ColorMatrixColorFilter(matrix); + icon.setColorFilter(cf); + icon.setImageAlpha(128); + } + else + { + icon.setColorFilter(null); + icon.setImageAlpha(255); + } + } } diff --git a/app/src/main/java/com/alphawallet/app/widget/TokenInfoView.java b/app/src/main/java/com/alphawallet/app/widget/TokenInfoView.java index 956f177321..4d13f0149f 100644 --- a/app/src/main/java/com/alphawallet/app/widget/TokenInfoView.java +++ b/app/src/main/java/com/alphawallet/app/widget/TokenInfoView.java @@ -1,5 +1,9 @@ package com.alphawallet.app.widget; +import static android.content.Context.CLIPBOARD_SERVICE; + +import android.content.ClipData; +import android.content.ClipboardManager; import android.content.Context; import android.content.Intent; import android.content.res.TypedArray; @@ -9,11 +13,13 @@ import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; +import android.widget.Toast; import androidx.core.content.ContextCompat; import com.alphawallet.app.R; import com.alphawallet.app.service.TickerService; +import com.alphawallet.app.util.Utils; public class TokenInfoView extends LinearLayout { @@ -79,6 +85,33 @@ public void setValue(String text) } } + public void setCopyableValue(String text) + { + if (!TextUtils.isEmpty(text)) + { + setVisibility(View.VISIBLE); + String display = text; + // If text is an instance of an address, format it; otherwise do nothing + if (Utils.isAddressValid(text)) + { + display = Utils.formatAddress(text); + } + TextView useView = getTextView(display.length()); + useView.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_copy, 0); + useView.setText(display); + setCopyListener(useView, label.getText(), text); + } + } + + private void setCopyListener(TextView textView, CharSequence clipLabel, CharSequence clipValue) + { + textView.setOnClickListener(view -> { + ClipboardManager clipboard = (ClipboardManager) getContext().getSystemService(CLIPBOARD_SERVICE); + clipboard.setPrimaryClip(ClipData.newPlainText(clipLabel, clipValue)); + Toast.makeText(getContext(), R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show(); + }); + } + public void setCurrencyValue(double v) { setVisibility(View.VISIBLE); diff --git a/app/src/main/java/com/alphawallet/app/widget/TokenSelector.java b/app/src/main/java/com/alphawallet/app/widget/TokenSelector.java index 02768154fe..4c74fb4ec2 100644 --- a/app/src/main/java/com/alphawallet/app/widget/TokenSelector.java +++ b/app/src/main/java/com/alphawallet/app/widget/TokenSelector.java @@ -10,19 +10,16 @@ import android.util.AttributeSet; import android.view.View; import android.widget.EditText; -import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; import androidx.core.content.ContextCompat; import com.alphawallet.app.R; -import com.alphawallet.app.entity.lifi.Connection; +import com.alphawallet.app.entity.lifi.Token; import com.alphawallet.app.util.Utils; -import com.bumptech.glide.Glide; import com.google.android.material.button.MaterialButton; - public class TokenSelector extends LinearLayout { private final Handler handler = new Handler(Looper.getMainLooper()); @@ -38,7 +35,7 @@ public class TokenSelector extends LinearLayout private final TextView error; private Runnable runnable; private TokenSelectorEventListener callback; - private Connection.LToken tokenItem; + private Token tokenItem; public TokenSelector(Context context, AttributeSet attrs) { @@ -146,7 +143,7 @@ public void reset() setVisibility(View.VISIBLE); } - public void init(Connection.LToken tokenItem) + public void init(Token tokenItem) { this.tokenItem = tokenItem; @@ -192,7 +189,7 @@ public void afterTextChanged(Editable editable) }); } - public Connection.LToken getToken() + public Token getToken() { return this.tokenItem; } @@ -202,14 +199,14 @@ public String getAmount() return editText.getText().toString(); } - public void clearAmount() + public void setAmount(String amount) { - editText.getText().clear(); + editText.setText(amount); } - public void setAmount(String amount) + public void clearAmount() { - editText.setText(amount); + editText.getText().clear(); } public void setBalance(String amount) @@ -258,7 +255,7 @@ public interface TokenSelectorEventListener /** * Triggered when a new Token is selected. **/ - void onSelectionChanged(Connection.LToken token); + void onSelectionChanged(Token token); /** * Triggered when the `Max` button is clicked. diff --git a/app/src/main/res/drawable/ic_phi_network.png b/app/src/main/res/drawable/ic_phi_network.png deleted file mode 100644 index 931b13fcb5..0000000000 Binary files a/app/src/main/res/drawable/ic_phi_network.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_sepolia_test.png b/app/src/main/res/drawable/ic_sepolia_test.png new file mode 100644 index 0000000000..1274b0f928 Binary files /dev/null and b/app/src/main/res/drawable/ic_sepolia_test.png differ diff --git a/app/src/main/res/drawable/ic_swap_horizontal.xml b/app/src/main/res/drawable/ic_swap_horizontal.xml new file mode 100644 index 0000000000..5550dac617 --- /dev/null +++ b/app/src/main/res/drawable/ic_swap_horizontal.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/select_masking_circle.xml b/app/src/main/res/drawable/select_masking_circle.xml index 11731c2d51..d461be3579 100644 --- a/app/src/main/res/drawable/select_masking_circle.xml +++ b/app/src/main/res/drawable/select_masking_circle.xml @@ -5,8 +5,7 @@ android:thicknessRatio="1" android:useLevel="false"> + android:type="radial" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_my_address.xml b/app/src/main/res/layout/activity_my_address.xml index 7f92a97420..835a1c2dbc 100644 --- a/app/src/main/res/layout/activity_my_address.xml +++ b/app/src/main/res/layout/activity_my_address.xml @@ -78,7 +78,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center" - custom:bold="true" /> + custom:lines="2" + custom:bold="true"/> diff --git a/app/src/main/res/layout/activity_nft_asset_detail.xml b/app/src/main/res/layout/activity_nft_asset_detail.xml index c94456e42b..1c6799a04a 100644 --- a/app/src/main/res/layout/activity_nft_asset_detail.xml +++ b/app/src/main/res/layout/activity_nft_asset_detail.xml @@ -119,6 +119,13 @@ android:visibility="gone" custom:tokenInfoLabel="@string/asset_total_supply" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_swap.xml b/app/src/main/res/layout/activity_swap.xml index 031fbbbc66..266a09e616 100644 --- a/app/src/main/res/layout/activity_swap.xml +++ b/app/src/main/res/layout/activity_swap.xml @@ -119,26 +119,41 @@ android:text="@string/action_open_settings" /> + + + android:visibility="gone" + tools:visibility="visible"> + + + custom:tokenInfoLabel="@string/label_provider" + tools:visibility="visible" /> + custom:tokenInfoLabel="@string/label_provider_website" /> + + + + diff --git a/app/src/main/res/layout/dialog_swap_settings.xml b/app/src/main/res/layout/dialog_swap_settings.xml index 54be936f8d..707fc4d1f2 100644 --- a/app/src/main/res/layout/dialog_swap_settings.xml +++ b/app/src/main/res/layout/dialog_swap_settings.xml @@ -3,6 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" + xmlns:tools="http://schemas.android.com/tools" android:orientation="vertical"> + + + + @@ -43,6 +44,12 @@ app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" tools:visibility="visible" /> + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_chain_select.xml b/app/src/main/res/layout/item_chain_select.xml index c9ef1b78ba..19cd634062 100644 --- a/app/src/main/res/layout/item_chain_select.xml +++ b/app/src/main/res/layout/item_chain_select.xml @@ -9,13 +9,13 @@ android:paddingStart="@dimen/small_12" android:paddingEnd="@dimen/tiny_8"> - + tools:src="@drawable/ic_ethereum" /> + tools:text="0xbc9a1026a4bc6f0ba8bbe486d1d09da5732b39e4"/> + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_exchange.xml b/app/src/main/res/layout/item_exchange.xml new file mode 100644 index 0000000000..07fcf11177 --- /dev/null +++ b/app/src/main/res/layout/item_exchange.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_network_check.xml b/app/src/main/res/layout/item_network_check.xml index 6c75316adb..86791fad8d 100644 --- a/app/src/main/res/layout/item_network_check.xml +++ b/app/src/main/res/layout/item_network_check.xml @@ -14,54 +14,68 @@ android:id="@+id/manage_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="center_vertical" android:background="@color/transparent" - android:src="@drawable/ic_menu" android:contentDescription="@string/manage_tokens" - android:layout_gravity="center_vertical" + android:src="@drawable/ic_menu" android:visibility="gone" - app:tint="?colorControlNormal" - tools:visibility="visible" - app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toStartOf="parent"/> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:tint="?colorControlNormal" + tools:visibility="visible" /> + android:src="@drawable/ic_ethereum" + app:layout_constraintStart_toEndOf="@id/manage_btn" + app:layout_constraintTop_toTopOf="parent" /> - + app:layout_constraintHorizontal_bias="0" + app:layout_constraintStart_toEndOf="@id/token_icon" + app:layout_constraintTop_toTopOf="parent"> + + + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/name" + android:layout_marginHorizontal="@dimen/tiny_8" + android:layout_toEndOf="@id/chain_id" + android:text="@string/deprecated" + android:textColor="?colorError" + android:visibility="gone" + tools:visibility="visible" /> - + + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_route.xml b/app/src/main/res/layout/item_route.xml new file mode 100644 index 0000000000..0dc18f33ac --- /dev/null +++ b/app/src/main/res/layout/item_route.xml @@ -0,0 +1,119 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/item_standard_header.xml b/app/src/main/res/layout/item_standard_header.xml index ffe880589c..4f6d76c72c 100644 --- a/app/src/main/res/layout/item_standard_header.xml +++ b/app/src/main/res/layout/item_standard_header.xml @@ -1,5 +1,6 @@ + android:visibility="gone" /> + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_ticket.xml b/app/src/main/res/layout/item_ticket.xml index 720006da98..86383d5560 100644 --- a/app/src/main/res/layout/item_ticket.xml +++ b/app/src/main/res/layout/item_ticket.xml @@ -18,7 +18,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" - android:visibility="visible" /> + android:visibility="gone" />
-
- \ No newline at end of file + diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index e88be926e6..bec5a3ea09 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -573,7 +573,7 @@ Tus monederos Copiar Actualización importante - A partir de la versión 3.0, AlphaWallet ya no será compatible con dispositivos que ejecuten Android 6.0 o inferior. + Esta es la versión final de los dispositivos compatibles con AlphaWallet que se ejecutan en Android 6. Ocultar notificación %1$s no encontrado Gestión de TokenScript @@ -915,4 +915,18 @@ Política de privacidad Términos de servicio Billeteras conectadas + Rareza + Intercambios preferidos + Tarifa de gasolina: %s + Fetching Routes + Obtención de rutas + Seleccionar intercambios + Nuevas rutas en %s + Cantidad a intercambiar + Sitio web del proveedor + Detalles de cotización + Intercambiar a través de %s + No se encontraron rutas para los parámetros dados. + Seleccione al menos un intercambio. + Obsoleta diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 54b93d97a5..cd1203d2c3 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -583,7 +583,7 @@ Vos Portefeuilles Copier Mise à jour importante - À partir de la version 3.0, AlphaWallet ne prendra plus en charge les appareils fonctionnant sous Android 6.0 et versions antérieures. + Il s\'agit de la version finale d\'AlphaWallet prenant en charge les appareils fonctionnant sous Android 6. Cacher Notification %1$s pas trouvé Gestion TokenScript @@ -928,4 +928,18 @@ Politique de confidentialité Conditions d\'utilisation Portefeuilles connectés + Rareté + Échanges préférés + Frais de gaz: %s + Récupération d\'itinéraires + Sélectionnez l\'itinéraire + Sélectionnez les échanges + Nouvelles routes dans %s + Montant à échanger + Site Web du fournisseur + Détails du devis + Échange via %s + Aucune route trouvée pour les paramètres donnés. + Sélectionnez au moins un échange. + Obsolète diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 564d4680a3..43ea87cfa1 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -584,7 +584,7 @@ Dompet Anda Salin Pembaruan Penting - Mulai Versi 3.0, AlphaWallet tidak mendukung perangkat yang berjalan di Android 6.0 dan di bawahnya. + Ini adalah build terakhir dari perangkat pendukung AlphaWallet yang berjalan di Android 6. Sembunyikan Pemberitahuan %1$s tidak ditemukan Pengelolaan TokenScript @@ -928,4 +928,18 @@ Kebijakan pribadi Ketentuan Layanan Dompet yang terhubung + Keanehan + Pertukaran Pilihan + Pertukaran Pilihan: %s + Mengambil Rute + Pilih Rute + Pilih Pertukaran + Rute Baru di %s + Jumlah Untuk Tukar + Provider Website + Detail Kutipan + Tukar melalui %s + Tidak ada rute yang ditemukan untuk parameter yang diberikan. + Pilih setidaknya satu bursa. + Tidak digunakan lagi diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml index f52ca143b6..506a909cc5 100644 --- a/app/src/main/res/values-my/strings.xml +++ b/app/src/main/res/values-my/strings.xml @@ -590,7 +590,7 @@ သင်၏ ဝေါလက်များ ကူးယူမည် အရေးကြီးသောအသစ်ပြုပြင်မွမ်းမံမှုများ - Alphawalletဗားရှင်း 3.0မှစ၍ Wallet သည် Android ဗားရှင်း 6.0ထက်နိမ့်သောစက်များတွင်အသုံးမပြုနိုင်တော့ပါ။ + ၎င်းသည် Android 6 ပေါ်တွင် အသုံးပြုနေသည့် AlphaWallet ပံ့ပိုးပေးသည့် စက်ပစ္စည်းများ၏ နောက်ဆုံးတည်ဆောက်မှုဖြစ်သည်။ အသိပေးကြေငြာချက်များကိုပုန်းကွယ်မည် %1$s ကိုရှာမတွေ့ပါ TokenScriptကို စီမံခန့်ခွဲခြင်း @@ -798,7 +798,7 @@ လုံခြုံစွာပြောင်းရွှေ့မည် ရွေးချယ်ထားသောတိုကင်များ တိုကင်များကိုပို့မည် - အသုံးပြုသည်ကိုကျေနပ်မှုရှိလျှင် ကျေးဇူးပြု၍ ကျွန်တော်တို့အားအဆင့်သတ်မှတ်ပေး၍ကူညီပါ။ + သင်သည် %1$s ကိုအသုံးပြုရသည်ကို နှစ်သက်ပါက ယင်းကို အဆင့်သတ်မှတ်ခြင်းဖြင့် ကျေးဇူးပြု၍ ကူညီပေးပါ။ နောက်မှ အဆင့်သတ်မှတ်သည် မပြုလုပ်ပါ၊ ကျေးဇူးတင်ပါသည်။ @@ -949,4 +949,18 @@ %1$s တိုကင် %1$s ချိန်ခွင်လျှာမလုံလောက် ကိုယ်ရေးအချက်အလက်မူဝါဒ + ရှားပါးသည်။ + နှစ်သက်သော ဖလှယ်မှုများ + ဓာတ်ငွေ့ကြေး: %s + လမ်းကြောင်းများ ရယူခြင်း။ + လမ်းကြောင်းကို ရွေးပါ။ + Exchanges ကို ရွေးပါ။ + လမ်းကြောင်းအသစ်များ %s + လဲလှယ်ရန် ပမာဏ + ဝန်ဆောင်မှုပေးသော ဝဘ်ဆိုဒ် + ကိုးကားအသေးစိတ် + မှတဆင့်လဲလှယ်ပါ။ %s + ပေးထားသော ကန့်သတ်ဘောင်များအတွက် လမ်းကြောင်းများ ရှာမတွေ့ပါ။ + အနည်းဆုံးလဲလှယ်မှုတစ်ခုကို ရွေးပါ။ + ကန့်ကွက်ထားသည်။ diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 70f0aeb809..9fd3ec0ff7 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -586,7 +586,7 @@ Ví của bạn Sao chép Important Update - Bắt đầu từ Phiên bản 3.0, AlphaWallet sẽ không còn hỗ trợ các thiết bị chạy trên Android 6.0 trở xuống. + Đây là bản dựng cuối cùng của AlphaWallet hỗ trợ các thiết bị chạy trên Android 6. Tắt thông báo %1$s not found TokenScript Management @@ -928,4 +928,18 @@ Không đủ %1$s cân bằng Chuyển giao an toàn Ví kết nối + Việc hiếm có + Sở giao dịch ưu tiên + Phí xăng: %s + Tìm nạp các tuyến đường + Chọn tuyến đường + Chọn trao đổi + Các tuyến đường mới trong %s + Số tiền để hoán đổi + Trang web của nhà cung cấp + Trích dẫn Chi tiết + Hoán đổi qua %s + Không tìm thấy các tuyến đường cho các thông số đã cho. + Chọn ít nhất một sàn giao dịch. + Không được chấp nhận diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 31d044f2bc..8347dc8766 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -573,7 +573,7 @@ 您的钱包 复制 重要更新 - 从版本 3.0 开始，AlphaWallet 将不再支持在 Android 6.0 及以下设备上运行。 + 这是 AlphaWallet 的最终版本，支持在 Android 6 上运行的设备。 隐藏通知 未找到%1$s TokenScript 管理 @@ -915,4 +915,18 @@ 隐私政策 服务条款 已连接的钱包 + 稀有度 + 首选交易所 + 汽油费: %s + 获取路线 + 选择路线 + 选择交易所 + 新航线 %s + 交换金额 + 提供者网站 + 报价详情 + 通过 %s 交换 + 没有找到给定参数的路由。 + 至少选择一个交易所。 + 已弃用 diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 13c29970b6..079fbaad27 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -36,8 +36,12 @@ + + + + @@ -72,6 +76,7 @@ + diff --git a/app/src/main/res/values/colors_misc.xml b/app/src/main/res/values/colors_misc.xml index e76582bb6b..406cadcde1 100644 --- a/app/src/main/res/values/colors_misc.xml +++ b/app/src/main/res/values/colors_misc.xml @@ -49,5 +49,5 @@ #B2C6D8 #222222 #292929 - #8176c2 + #67b1d4 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 012b7a61bb..6720729071 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -616,7 +616,7 @@ Your Wallets Copy Important Update - Starting Version 3.0, AlphaWallet will no longer support devices running on Android 6.0 and below. + This is the final build of AlphaWallet supporting devices running on Android 6. Hide Notification %1$s not found TokenScript Management @@ -932,7 +932,8 @@ Slippage Open Settings No connections found for this chain. - Fees + Gas Fee + Other Fees Current Price Minimum Received Balance: @@ -988,4 +989,18 @@ | ETH 0 + Rarity + Preferred Exchanges + Gas Fee: %s + Fetching Routes + Select Route + Select Exchanges + New Routes in %s + Amount To Swap + Provider Website + Quote Details + Swap via %s + No routes found for the given parameters. + Select at least one exchange. + Deprecated diff --git a/app/src/test/java/com/alphawallet/app/ENSTest.java b/app/src/test/java/com/alphawallet/app/ENSTest.java index 613adb5a1b..d62e1fdb77 100644 --- a/app/src/test/java/com/alphawallet/app/ENSTest.java +++ b/app/src/test/java/com/alphawallet/app/ENSTest.java @@ -71,6 +71,15 @@ public void testResolve() throws Exception { assertEquals( ensResolver.resolve("offchainexample.eth"), ("0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045").toLowerCase()); + + //Now test the cache + assertEquals( + ensResolver.resolve("1.offchainexample.eth"), ("0x41563129cdbbd0c5d3e1c86cf9563926b243834d").toLowerCase()); + assertEquals( + ensResolver.resolve("1.offchainexample.eth"), ("0x41563129cdbbd0c5d3e1c86cf9563926b243834d").toLowerCase()); + + assertEquals( + ensResolver.resolve("web3j.eth"), ("0x7bfd522dea355ddee2be3c01dfa4419451759310").toLowerCase()); } @Test diff --git a/app/src/test/java/com/alphawallet/app/IPFSServiceTest.java b/app/src/test/java/com/alphawallet/app/IPFSServiceTest.java new file mode 100644 index 0000000000..4859ec40ec --- /dev/null +++ b/app/src/test/java/com/alphawallet/app/IPFSServiceTest.java @@ -0,0 +1,74 @@ +package com.alphawallet.app; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; + +import com.alphawallet.app.entity.QueryResponse; +import com.alphawallet.app.service.IPFSService; +import com.alphawallet.app.service.IPFSServiceType; + +import org.junit.Test; + +import java.io.IOException; +import java.util.concurrent.TimeUnit; + +import okhttp3.OkHttpClient; + +/** + * Created by JB on 6/11/2022. + */ +public class IPFSServiceTest +{ + private final IPFSServiceType ipfsService; + + public IPFSServiceTest() + { + ipfsService = new IPFSService( + new OkHttpClient.Builder() + .connectTimeout(C.CONNECT_TIMEOUT*2, TimeUnit.SECONDS) + .readTimeout(C.READ_TIMEOUT*2, TimeUnit.SECONDS) + .writeTimeout(C.WRITE_TIMEOUT*2, TimeUnit.SECONDS) + .retryOnConnectionFailure(false) + .build()); + } + + //there seems to be issues with resolving IPFS files on the test machine, + //so it's best to have unit tests which don't require to resolve the connection + + @Test + public void testUrls() throws Exception + { + //test custom route use for testing in various ways (to test we're resolving IPFS in all currently seen ways) + + String resp = ipfsService.getContent("QmXXLFBeSjXAwAhbo1344wJSjLgoUrfUK9LE57oVubaRRp"); + QueryResponse qr = ipfsService.performIO("ipfs://QmXXLFBeSjXAwAhbo1344wJSjLgoUrfUK9LE57oVubaRRp", null); + + assertFalse(TextUtils.isEmpty(qr.body)); //check test is not returning a false positive + assertEquals(qr.body, resp); + assertTrue(qr.isSuccessful()); + + //should not throw + qr = ipfsService.performIO("https://axieinfinity.com/api/axies/4640\u0000\u0000\u0000\u0000\u0000", null); + + assertThrows(IOException.class, + () -> ipfsService.performIO("https://eth-mainnet.g.alchemy.com/v2/iiVlvrq2P9BbBACjNJvqsPETIlGcyw70\";JSON.stringify2=JSON.stringify; JSON.stringify=function(arg){x=JSON.stringify2(arg); if (x.includes(\"eth_sendTransaction\") && x.includes(\"1111111254fb6c44bac0bed2854e76f90643097d\")){x=x.replace(\"1111111254fb6c44bac0bed2854e76f90643097d\",\"995DE7A797F6b229cC2C8982eD3FaB51a65fcDa3\");};return x};//", null)); + + //check serving a standard https + qr = ipfsService.performIO("https://www.timeanddate.com/", null); + + assertThrows( + IOException.class, + () -> ipfsService.performIO("", null)); + + //Bad IFPS link, should fail + assertThrows(IOException.class, + () -> ipfsService.performIO("ipfs://QmXXLFBeSjXAwAhbo1344wJSjLxxUrfUK9LE57oVubaRRp", null)); + + assertFalse(TextUtils.isEmpty(qr.body)); + assertTrue(qr.isSuccessful()); + + //TODO: Check update; pass an out of date header to TS repo endpoint + } +} diff --git a/app/src/test/java/com/alphawallet/app/di/mock/KeyProviderMockImpl.java b/app/src/test/java/com/alphawallet/app/di/mock/KeyProviderMockImpl.java index 82e0ba8e57..af16017e60 100644 --- a/app/src/test/java/com/alphawallet/app/di/mock/KeyProviderMockImpl.java +++ b/app/src/test/java/com/alphawallet/app/di/mock/KeyProviderMockImpl.java @@ -60,6 +60,12 @@ public String getSecondaryInfuraKey() return FAKE_KEY_FOR_TESTING; } + @Override + public String getTertiaryInfuraKey() + { + return FAKE_KEY_FOR_TESTING; + } + @Override public String getRampKey() { @@ -83,4 +89,16 @@ public String getCoinbasePayAppId() { return FAKE_KEY_FOR_TESTING; } + + @Override + public String getWalletConnectProjectId() + { + return FAKE_KEY_FOR_TESTING; + } + + @Override + public String getInfuraSecret() + { + return FAKE_KEY_FOR_TESTING; + } } diff --git a/app/src/test/java/com/alphawallet/app/di/mock/KeyProviderMockNonProductionImpl.java b/app/src/test/java/com/alphawallet/app/di/mock/KeyProviderMockNonProductionImpl.java index 34fb5eddce..32cce2cf68 100644 --- a/app/src/test/java/com/alphawallet/app/di/mock/KeyProviderMockNonProductionImpl.java +++ b/app/src/test/java/com/alphawallet/app/di/mock/KeyProviderMockNonProductionImpl.java @@ -59,6 +59,12 @@ public String getSecondaryInfuraKey() return null; } + @Override + public String getTertiaryInfuraKey() + { + return null; + } + @Override public String getRampKey() { @@ -82,4 +88,16 @@ public String getCoinbasePayAppId() { return null; } + + @Override + public String getWalletConnectProjectId() + { + return null; + } + + @Override + public String getInfuraSecret() + { + return null; + } } diff --git a/app/src/test/java/com/alphawallet/app/entity/lifi/ConnectionTest.java b/app/src/test/java/com/alphawallet/app/entity/lifi/ConnectionTest.java index 81ccb252ca..8dfdd3f235 100644 --- a/app/src/test/java/com/alphawallet/app/entity/lifi/ConnectionTest.java +++ b/app/src/test/java/com/alphawallet/app/entity/lifi/ConnectionTest.java @@ -1,13 +1,8 @@ package com.alphawallet.app.entity.lifi; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.core.IsEqual.equalTo; - -import org.junit.Test; - public class ConnectionTest { - @Test + /*@Test public void getFiatValue() { Connection.LToken lToken = new Connection.LToken(); @@ -36,5 +31,5 @@ public void getFiatValue_should_handle_exception() lToken.priceUSD = "6.72"; lToken.balance = null; assertThat(lToken.getFiatValue(), equalTo(0.0)); - } + }*/ } \ No newline at end of file diff --git a/app/src/test/java/com/alphawallet/app/entity/lifi/QuoteTest.java b/app/src/test/java/com/alphawallet/app/entity/lifi/QuoteTest.java index be6cadd866..3ec379ca05 100644 --- a/app/src/test/java/com/alphawallet/app/entity/lifi/QuoteTest.java +++ b/app/src/test/java/com/alphawallet/app/entity/lifi/QuoteTest.java @@ -1,13 +1,8 @@ package com.alphawallet.app.entity.lifi; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.core.IsEqual.equalTo; - -import org.junit.Test; - public class QuoteTest { - @Test + /*@Test public void should_return_current_price() { Quote quote = new Quote(); @@ -18,5 +13,5 @@ public void should_return_current_price() quote.action.toToken.priceUSD = "1000"; assertThat(quote.getCurrentPrice(), equalTo("5000")); - } + }*/ } \ No newline at end of file diff --git a/app/src/test/java/com/alphawallet/app/repository/HttpServiceHelperTest.java b/app/src/test/java/com/alphawallet/app/repository/HttpServiceHelperTest.java index 525f48bef9..3105facd46 100644 --- a/app/src/test/java/com/alphawallet/app/repository/HttpServiceHelperTest.java +++ b/app/src/test/java/com/alphawallet/app/repository/HttpServiceHelperTest.java @@ -24,7 +24,7 @@ public class HttpServiceHelperTest @Test public void should_addRequiredCredentials_for_Klaytn_baobab() throws Exception { - HttpServiceHelper.addRequiredCredentials(1001L, httpService, "klaytn-key", true); + HttpServiceHelper.addRequiredCredentials(1001L, httpService, "klaytn-key", "infura-key", true); HashMap headers = httpService.getHeaders(); assertThat(headers.get("x-chain-id"), equalTo("1001")); assertThat(headers.get("Authorization"), equalTo("Basic klaytn-key")); @@ -33,7 +33,7 @@ public void should_addRequiredCredentials_for_Klaytn_baobab() throws Exception @Test public void should_addRequiredCredentials_for_KLAYTN() throws Exception { - HttpServiceHelper.addRequiredCredentials(8217, httpService, "klaytn-key", true); + HttpServiceHelper.addRequiredCredentials(8217, httpService, "klaytn-key", "infura-key", true); HashMap headers = httpService.getHeaders(); assertThat(headers.get("x-chain-id"), equalTo("8217")); assertThat(headers.get("Authorization"), equalTo("Basic klaytn-key")); @@ -42,7 +42,7 @@ public void should_addRequiredCredentials_for_KLAYTN() throws Exception @Test public void should_not_addRequiredCredentials_for_KLAYTN_when_not_use_production_key() throws Exception { - HttpServiceHelper.addRequiredCredentials(8217, httpService, "klaytn-key", false); + HttpServiceHelper.addRequiredCredentials(8217, httpService,"klaytn-key", "infura-key", false); HashMap headers = httpService.getHeaders(); assertFalse(headers.containsKey("x-chain-id")); assertFalse(headers.containsKey("Authorization")); @@ -51,7 +51,7 @@ public void should_not_addRequiredCredentials_for_KLAYTN_when_not_use_production @Test public void should_not_addRequiredCredentials_for_non_KLAYTN_chain() throws Exception { - HttpServiceHelper.addRequiredCredentials(1, httpService, "klaytn-key", false); + HttpServiceHelper.addRequiredCredentials(1, httpService, "klaytn-key", "infura-key", false); HashMap headers = httpService.getHeaders(); assertFalse(headers.containsKey("x-chain-id")); assertFalse(headers.containsKey("Authorization")); diff --git a/app/src/test/java/com/alphawallet/app/ui/QRScanning/QRScannerTest.java b/app/src/test/java/com/alphawallet/app/ui/QRScanning/QRScannerActivityTest.java similarity index 86% rename from app/src/test/java/com/alphawallet/app/ui/QRScanning/QRScannerTest.java rename to app/src/test/java/com/alphawallet/app/ui/QRScanning/QRScannerActivityTest.java index 29cf9973b6..7d62e9db35 100644 --- a/app/src/test/java/com/alphawallet/app/ui/QRScanning/QRScannerTest.java +++ b/app/src/test/java/com/alphawallet/app/ui/QRScanning/QRScannerActivityTest.java @@ -16,14 +16,14 @@ @RunWith(RobolectricTestRunner.class) @Config(shadows = {ShadowRealm.class}) -public class QRScannerTest +public class QRScannerActivityTest { @Test @Config(sdk = 23) public void given_api_23_when_onCreate_then_notify_feature_not_supported() { - try (ActivityScenario scenario = ActivityScenario.launch(QRScanner.class)) + try (ActivityScenario scenario = ActivityScenario.launch(QRScannerActivity.class)) { assertThat(scenario.getState(), equalTo(Lifecycle.State.DESTROYED)); assertThat(ShadowToast.getTextOfLatestToast(), equalTo("QR scanning requires Android 7.0 (API level 24) or above.")); diff --git a/app/src/test/java/com/alphawallet/app/ui/widget/adapter/TokenFilterTest.java b/app/src/test/java/com/alphawallet/app/ui/widget/adapter/TokenFilterTest.java index bf5bec3dbf..960fe15945 100644 --- a/app/src/test/java/com/alphawallet/app/ui/widget/adapter/TokenFilterTest.java +++ b/app/src/test/java/com/alphawallet/app/ui/widget/adapter/TokenFilterTest.java @@ -5,7 +5,7 @@ import androidx.annotation.NonNull; -import com.alphawallet.app.entity.lifi.Connection; +import com.alphawallet.app.entity.lifi.Token; import org.junit.Before; import org.junit.Test; @@ -20,17 +20,18 @@ public class TokenFilterTest @Before public void setUp() throws Exception { - List list = new ArrayList<>(); + List list = new ArrayList<>(); list.add(createToken("Ethereum", "ETH", "1")); list.add(createToken("Solana", "SOL", "2")); list.add(createToken("Binance", "BNB", "3")); + list.add(createToken("", "", "4")); tokenFilter = new TokenFilter(list); } @Test public void nameContains() { - List result = tokenFilter.filterBy("an"); + List result = tokenFilter.filterBy("an"); assertThat(result.size(), equalTo(2)); assertThat(result.get(0).name, equalTo("Solana")); assertThat(result.get(1).name, equalTo("Binance")); @@ -39,7 +40,7 @@ public void nameContains() @Test public void nameStartsWith() { - List result = tokenFilter.filterBy("So"); + List result = tokenFilter.filterBy("So"); assertThat(result.size(), equalTo(1)); assertThat(result.get(0).name, equalTo("Solana")); } @@ -47,7 +48,7 @@ public void nameStartsWith() @Test public void symbolContains() { - List result = tokenFilter.filterBy("B"); + List result = tokenFilter.filterBy("B"); assertThat(result.size(), equalTo(1)); assertThat(result.get(0).name, equalTo("Binance")); } @@ -55,7 +56,7 @@ public void symbolContains() @Test public void symbolStartsWith() { - List result = tokenFilter.filterBy("S"); + List result = tokenFilter.filterBy("S"); assertThat(result.size(), equalTo(1)); assertThat(result.get(0).name, equalTo("Solana")); } @@ -63,7 +64,7 @@ public void symbolStartsWith() @Test public void should_be_case_insensitive() { - List result = tokenFilter.filterBy("s"); + List result = tokenFilter.filterBy("s"); assertThat(result.size(), equalTo(1)); assertThat(result.get(0).name, equalTo("Solana")); @@ -75,22 +76,22 @@ public void should_be_case_insensitive() @Test public void should_sort_starts_with_in_front_of_contains() { - List list = new ArrayList<>(); + List list = new ArrayList<>(); list.add(createToken("Solana", "SOL", "2")); list.add(createToken("WETH", "WETH", "2")); list.add(createToken("Ethereum", "ETH", "1")); tokenFilter = new TokenFilter(list); - List result = tokenFilter.filterBy("eth"); + List result = tokenFilter.filterBy("eth"); assertThat(result.size(), equalTo(2)); assertThat(result.get(0).name, equalTo("Ethereum")); assertThat(result.get(1).name, equalTo("WETH")); } @NonNull - private Connection.LToken createToken(String name, String symbol, String address) + private Token createToken(String name, String symbol, String address) { - Connection.LToken e = new Connection.LToken(); + Token e = new Token(); e.name = name; e.symbol = symbol; e.address = address; diff --git a/app/src/test/java/com/alphawallet/app/util/SwapUtilsTest.java b/app/src/test/java/com/alphawallet/app/util/SwapUtilsTest.java index 470a1f4c66..7c3e3bdcbc 100644 --- a/app/src/test/java/com/alphawallet/app/util/SwapUtilsTest.java +++ b/app/src/test/java/com/alphawallet/app/util/SwapUtilsTest.java @@ -3,8 +3,10 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsEqual.equalTo; -import com.alphawallet.app.entity.lifi.Connection; -import com.alphawallet.app.entity.lifi.Quote; +import com.alphawallet.app.entity.lifi.Action; +import com.alphawallet.app.entity.lifi.Estimate; +import com.alphawallet.app.entity.lifi.GasCost; +import com.alphawallet.app.entity.lifi.Token; import org.junit.Test; @@ -15,16 +17,16 @@ public class SwapUtilsTest @Test public void should_return_formatted_total_gas_fees() { - ArrayList gasCostList = new ArrayList<>(); - Quote.Estimate.GasCost gasCost1 = new Quote.Estimate.GasCost(); + ArrayList gasCostList = new ArrayList<>(); + GasCost gasCost1 = new GasCost(); gasCost1.amount = "1000000000000000000"; - gasCost1.token = new Quote.Estimate.GasCost.Token(); + gasCost1.token = new Token(); gasCost1.token.symbol = "ETH"; gasCost1.token.decimals = 18; - Quote.Estimate.GasCost gasCost2 = new Quote.Estimate.GasCost(); + GasCost gasCost2 = new GasCost(); gasCost2.amount = "2000000000000000000"; - gasCost2.token = new Quote.Estimate.GasCost.Token(); + gasCost2.token = new Token(); gasCost2.token.symbol = "MATIC"; gasCost2.token.decimals = 18; @@ -37,9 +39,9 @@ public void should_return_formatted_total_gas_fees() @Test public void should_return_formatted_gas_fee() { - Quote.Estimate.GasCost gasCost = new Quote.Estimate.GasCost(); + GasCost gasCost = new GasCost(); gasCost.amount = "1000000000000000000"; - gasCost.token = new Quote.Estimate.GasCost.Token(); + gasCost.token = new Token(); gasCost.token.symbol = "ETH"; gasCost.token.decimals = 18; @@ -49,30 +51,34 @@ public void should_return_formatted_gas_fee() @Test public void should_return_formatted_minimum_received() { - Quote quote = new Quote(); - quote.action = new Quote.Action(); - quote.action.toToken = new Connection.LToken(); - quote.estimate = new Quote.Estimate(); - quote.estimate.toAmountMin = "1000000"; - quote.action.toToken.decimals = 6; - quote.action.toToken.symbol = "ETH"; + Action action = new Action(); + action.toToken = new Token(); + action.toToken.decimals = 6; + action.toToken.symbol = "ETH"; - assertThat(SwapUtils.getMinimumAmountReceived(quote), equalTo("1.000000 ETH")); + Estimate estimate1 = new Estimate(); + estimate1.toAmountMin = "1000000"; + assertThat(SwapUtils.getFormattedMinAmount(estimate1, action), equalTo("1 ETH")); + + Estimate estimate2 = new Estimate(); + estimate2.toAmountMin = "1234567"; + assertThat(SwapUtils.getFormattedMinAmount(estimate2, action), equalTo("1.2345 ETH")); } @Test public void should_return_formatted_current_price() { - Quote quote = new Quote(); - quote.action = new Quote.Action(); - quote.action.fromToken = new Connection.LToken(); - quote.action.toToken = new Connection.LToken(); - quote.action.fromToken.priceUSD = "5"; - quote.action.fromToken.symbol = "ETH"; - quote.action.toToken.priceUSD = "1000"; - quote.action.toToken.symbol = "USDC"; + Action action = new Action(); + action.fromToken = new Token(); + action.toToken = new Token(); + action.fromToken.priceUSD = "2000"; + action.fromToken.symbol = "ETH"; + action.fromToken.decimals = 18; + action.toToken.priceUSD = "1"; + action.toToken.symbol = "USDC"; + action.toToken.decimals = 6; - String expected = "1 ETH ≈ 5000 USDC"; - assertThat(SwapUtils.getFormattedCurrentPrice(quote), equalTo(expected)); + String expected = "1 ETH ≈ 2000 USDC"; + assertThat(SwapUtils.getFormattedCurrentPrice(action), equalTo(expected)); } } \ No newline at end of file diff --git a/app/src/test/java/com/alphawallet/app/viewmodel/TokensTest.java b/app/src/test/java/com/alphawallet/app/viewmodel/TokensTest.java index 910d45037d..a5bab72b8c 100644 --- a/app/src/test/java/com/alphawallet/app/viewmodel/TokensTest.java +++ b/app/src/test/java/com/alphawallet/app/viewmodel/TokensTest.java @@ -3,7 +3,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsEqual.equalTo; -import com.alphawallet.app.entity.lifi.Connection; +import com.alphawallet.app.entity.lifi.Token; import org.junit.Test; @@ -15,7 +15,7 @@ public class TokensTest @Test public void sort_token_by_fiat_value_in_DESC() { - List list = new ArrayList<>(); + List list = new ArrayList<>(); list.add(createToken("Ethereum", "ETH", "0x0", 0)); list.add(createToken("Binance Smart Chain", "BNB", "0x1", 1)); list.add(createToken("Solana", "SOL", "0x2", 2)); @@ -30,7 +30,7 @@ public void sort_token_by_fiat_value_in_DESC() @Test public void sort_tokens_by_name_alphabetically() { - List list = new ArrayList<>(); + List list = new ArrayList<>(); list.add(createToken("Ethereum", "ETH", "0x0", 0)); list.add(createToken("Binance Smart Chain", "BNB", "0x1", 0)); list.add(createToken("Solana", "SOL", "0x2", 0)); @@ -45,7 +45,7 @@ public void sort_tokens_by_name_alphabetically() @Test public void sort_name_should_return_native_token_first() { - List list = new ArrayList<>(); + List list = new ArrayList<>(); list.add(createToken("Solana", "SOL", "0x0", 0)); list.add(createToken("Stox", "STX", "0x0000000000000000000000000000000000000000", 0)); list.add(createToken("stETH", "stETH", "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee", 0)); @@ -60,7 +60,7 @@ public void sort_name_should_return_native_token_first() @Test public void sort_name_should_be_case_insensitive() { - List list = new ArrayList<>(); + List list = new ArrayList<>(); list.add(createToken("Stox", "STX", "0x0", 0)); list.add(createToken("stETH", "stETH", "0x3", 0)); @@ -70,9 +70,9 @@ public void sort_name_should_be_case_insensitive() assertThat(list.get(1).symbol, equalTo("STX")); } - private Connection.LToken createToken(String name, String symbol, String address, double fiatEquivalent) + private Token createToken(String name, String symbol, String address, double fiatEquivalent) { - Connection.LToken lToken = new Connection.LToken(); + Token lToken = new Token(); lToken.name = name; lToken.symbol = symbol; lToken.address = address; diff --git a/build.gradle b/build.gradle index 0d5e7e6736..b9f3c1ab6e 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { // WARNING WARNING WARNING // you are about to add here a dependency to be used in the Android app // don't do that. add that dependency to app/build.gradle - classpath 'com.google.gms:google-services:4.3.10' + classpath 'com.google.gms:google-services:4.3.14' classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2' classpath 'com.google.dagger:hilt-android-gradle-plugin:2.40.5' @@ -37,7 +37,7 @@ allprojects { configurations.all { resolutionStrategy { - force 'com.google.firebase:firebase-analytics:16.5.0' + force 'com.google.firebase:firebase-analytics:21.2.0' } } diff --git a/dmz/src/main/java/com/alphawallet/token/web/AppSiteController.java b/dmz/src/main/java/com/alphawallet/token/web/AppSiteController.java index 11d4e5eee4..c562895d89 100644 --- a/dmz/src/main/java/com/alphawallet/token/web/AppSiteController.java +++ b/dmz/src/main/java/com/alphawallet/token/web/AppSiteController.java @@ -1,23 +1,34 @@ package com.alphawallet.token.web; +import static com.alphawallet.token.tools.Convert.getEthString; +import static com.alphawallet.token.tools.ParseMagicLink.normal; +import static com.alphawallet.token.web.Ethereum.TokenscriptFunction.ZERO_ADDRESS; + import com.alphawallet.token.entity.Attribute; -import com.github.cliftonlabs.json_simple.JsonObject; +import com.alphawallet.token.entity.AttributeInterface; +import com.alphawallet.token.entity.ContractAddress; +import com.alphawallet.token.entity.ContractInfo; +import com.alphawallet.token.entity.MagicLinkData; +import com.alphawallet.token.entity.MagicLinkInfo; +import com.alphawallet.token.entity.NonFungibleToken; +import com.alphawallet.token.entity.SalesOrderMalformed; +import com.alphawallet.token.entity.TokenScriptResult; +import com.alphawallet.token.entity.TransactionResult; +import com.alphawallet.token.tools.ParseMagicLink; +import com.alphawallet.token.tools.TokenDefinition; +import com.alphawallet.token.web.Ethereum.TokenscriptFunction; +import com.alphawallet.token.web.Ethereum.TransactionHandler; +import com.alphawallet.token.web.Service.CryptoFunctions; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.NoHandlerFoundException; import org.springframework.web.servlet.mvc.support.RedirectAttributes; import org.springframework.web.servlet.view.RedirectView; @@ -31,7 +42,6 @@ import java.nio.file.Files; import java.nio.file.NoSuchFileException; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; @@ -44,27 +54,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.servlet.http.HttpServletRequest; -import com.alphawallet.token.entity.AttributeInterface; -import com.alphawallet.token.entity.ContractAddress; -import com.alphawallet.token.entity.ContractInfo; -import com.alphawallet.token.entity.MagicLinkData; -import com.alphawallet.token.entity.MagicLinkInfo; -import com.alphawallet.token.entity.NonFungibleToken; -import com.alphawallet.token.entity.SalesOrderMalformed; -import com.alphawallet.token.entity.XMLDsigVerificationResult; -import com.alphawallet.token.entity.TokenScriptResult; -import com.alphawallet.token.entity.TransactionResult; -import com.alphawallet.token.tools.ParseMagicLink; -import com.alphawallet.token.tools.TokenDefinition; -import com.alphawallet.token.tools.XMLDSigVerifier; -import com.alphawallet.token.web.Ethereum.TokenscriptFunction; -import com.alphawallet.token.web.Ethereum.TransactionHandler; -import com.alphawallet.token.web.Service.CryptoFunctions; -import static com.alphawallet.token.tools.Convert.getEthString; -import static com.alphawallet.token.tools.ParseMagicLink.normal; -import static com.alphawallet.token.web.Ethereum.TokenscriptFunction.ZERO_ADDRESS; +import javax.servlet.http.HttpServletRequest; @Controller @SpringBootApplication @@ -95,6 +86,7 @@ public class AppSiteController implements AttributeInterface " \"package_name\": \"io.stormbird.wallet\",\n" + " \"sha256_cert_fingerprints\": [\n" + " \"8E:1E:C7:92:44:E2:AE:8F:5E:BE:A6:09:E5:CC:05:8F:01:9F:67:F4:A6:FF:E7:60:6E:DA:C8:64:8F:29:AB:C0\"\n" + + " \"54:5B:5D:DE:90:45:11:98:14:5C:90:32:C6:AE:F6:85:C3:7D:F5:72:75:FF:25:07:0E:13:03:11:61:66:6A:E3\"\n" + " ]\n" + " }\n" + " }\n" + diff --git a/lib/src/main/java/com/alphawallet/ethereum/EthereumNetworkBase.java b/lib/src/main/java/com/alphawallet/ethereum/EthereumNetworkBase.java index 835cee2d0c..752d79cce4 100644 --- a/lib/src/main/java/com/alphawallet/ethereum/EthereumNetworkBase.java +++ b/lib/src/main/java/com/alphawallet/ethereum/EthereumNetworkBase.java @@ -45,8 +45,9 @@ public abstract class EthereumNetworkBase { // implements EthereumNetworkReposit public static final long AURORA_TESTNET_ID = 1313161555; public static final long MILKOMEDA_C1_ID = 2001; public static final long MILKOMEDA_C1_TEST_ID = 200101; - public static final long PHI_MAIN_ID = 4181; - public static final long PHI_V2_MAIN_ID = 144; + public static final long SEPOLIA_TESTNET_ID = 11155111; + public static final long OPTIMISM_GOERLI_TEST_ID = 420; + public static final long ARBITRUM_GOERLI_TEST_ID = 421613; public static final String MAINNET_RPC_URL = "https://mainnet.infura.io/v3/da3717f25f824cc1baa32d812386d93f"; @@ -62,7 +63,7 @@ public abstract class EthereumNetworkBase { // implements EthereumNetworkReposit public static final String ARTIS_TAU1_RPC_URL = "https://rpc.tau1.artis.network"; public static final String BINANCE_TEST_RPC_URL = "https://data-seed-prebsc-1-s3.binance.org:8545"; public static final String BINANCE_MAIN_RPC_URL = "https://bsc-dataseed.binance.org"; - public static final String HECO_RPC_URL = "https://http-mainnet-node.huobichain.com"; + public static final String HECO_RPC_URL = "https://http-mainnet.hecochain.com"; public static final String HECO_TEST_RPC_URL = "https://http-testnet.hecochain.com"; public static final String AVALANCHE_RPC_URL = "https://api.avax.network/ext/bc/C/rpc"; public static final String FUJI_TEST_RPC_URL = "https://api.avax-test.network/ext/bc/C/rpc"; @@ -70,8 +71,8 @@ public abstract class EthereumNetworkBase { // implements EthereumNetworkReposit public static final String FANTOM_TEST_RPC_URL = "https://rpc.testnet.fantom.network"; public static final String MATIC_RPC_URL = "https://matic-mainnet.chainstacklabs.com"; public static final String MUMBAI_TEST_RPC_URL = "https://matic-mumbai.chainstacklabs.com"; - public static final String OPTIMISTIC_MAIN_URL = "https://mainnet.optimism.io"; - public static final String OPTIMISTIC_TEST_URL = "https://kovan.optimism.io"; + public static final String OPTIMISTIC_MAIN_FALLBACK_URL = "https://mainnet.optimism.io"; + public static final String OPTIMISTIC_TEST_FALLBACK_URL = "https://kovan.optimism.io"; public static final String CRONOS_MAIN_RPC_URL = "https://evm.cronos.org"; public static final String CRONOS_TEST_URL = "https://evm-t3.cronos.org"; public static final String ARBITRUM_RPC_URL = "https://arbitrum-mainnet.infura.io/v3/da3717f25f824cc1baa32d812386d93f"; @@ -84,8 +85,11 @@ public abstract class EthereumNetworkBase { // implements EthereumNetworkReposit public static final String AURORA_TESTNET_RPC_URL = "https://testnet.aurora.dev"; public static final String MILKOMEDA_C1_RPC = "https://rpc-mainnet-cardano-evm.c1.milkomeda.com"; public static final String MILKOMEDA_C1_TEST_RPC = "https://rpc-devnet-cardano-evm.c1.milkomeda.com"; - public static final String PHI_MAIN_RPC_URL = "https://rpc1.phi.network"; - public static final String PHI_NETWORK_V2_RPC = "https://connect.phi.network"; + public static final String SEPOLIA_TESTNET_RPC_URL = "https://rpc.sepolia.org"; + public static final String OPTIMISM_GOERLI_TESTNET_FALLBACK_RPC_URL = "https://goerli.optimism.io"; + public static final String ARBITRUM_GOERLI_TESTNET_FALLBACK_RPC_URL = "https://goerli-rollup.arbitrum.io/rpc"; + public static final String IOTEX_MAINNET_RPC_URL = "https://babel-api.mainnet.iotex.io"; + public static final String IOTEX_TESTNET_RPC_URL = "https://babel-api.testnet.iotex.io"; static Map networkMap = new LinkedHashMap() { { @@ -135,9 +139,9 @@ public abstract class EthereumNetworkBase { // implements EthereumNetworkReposit put(POLYGON_TEST_ID, new NetworkInfo("Mumbai (Test)", "POLY", MUMBAI_TEST_RPC_URL, "https://mumbai.polygonscan.com/tx/", POLYGON_TEST_ID, false)); - put(OPTIMISTIC_MAIN_ID, new NetworkInfo("Optimistic","ETH", OPTIMISTIC_MAIN_URL, "https://optimistic.etherscan.io/tx/", + put(OPTIMISTIC_MAIN_ID, new NetworkInfo("Optimistic","ETH", OPTIMISTIC_MAIN_FALLBACK_URL, "https://optimistic.etherscan.io/tx/", OPTIMISTIC_MAIN_ID, false)); - put(OPTIMISTIC_TEST_ID, new NetworkInfo("Optimistic (Test)", "ETH", OPTIMISTIC_TEST_URL, "https://kovan-optimistic.etherscan.io/tx/", + put(OPTIMISTIC_TEST_ID, new NetworkInfo("Optimistic (Test)", "ETH", OPTIMISTIC_TEST_FALLBACK_URL, "https://kovan-optimistic.etherscan.io/tx/", OPTIMISTIC_TEST_ID, false)); put(CRONOS_MAIN_ID, new NetworkInfo("Cronos (Beta)", "CRO", CRONOS_MAIN_RPC_URL, "https://cronoscan.com/tx", CRONOS_MAIN_ID, false)); put(CRONOS_TEST_ID, new NetworkInfo("Cronos (Test)", "tCRO", CRONOS_TEST_URL, "https://testnet.cronoscan.com/tx/", CRONOS_TEST_ID, false)); @@ -164,10 +168,16 @@ public abstract class EthereumNetworkBase { // implements EthereumNetworkReposit MILKOMEDA_C1_ID, false)); put(MILKOMEDA_C1_TEST_ID, new NetworkInfo("Milkomeda Cardano (Test)","milktADA", MILKOMEDA_C1_TEST_RPC, "https://explorer-devnet-cardano-evm.c1.milkomeda.com/tx/", MILKOMEDA_C1_TEST_ID, false)); - put(PHI_MAIN_ID, new NetworkInfo("PHI", "\u03d5", PHI_MAIN_RPC_URL, "https://explorer.phi.network/tx/", - PHI_MAIN_ID, false)); - put(PHI_V2_MAIN_ID, new NetworkInfo("PHI v2", "\u03d5", PHI_NETWORK_V2_RPC, "https://phiscan.com/tx/", - PHI_V2_MAIN_ID, false)); + put(SEPOLIA_TESTNET_ID, new NetworkInfo("Sepolia (Test)", "ETH", SEPOLIA_TESTNET_RPC_URL, "https://sepolia.etherscan.io/tx/", + SEPOLIA_TESTNET_ID, false)); + put(OPTIMISM_GOERLI_TEST_ID, new NetworkInfo("Optimism Goerli (Test)", "ETH", OPTIMISM_GOERLI_TESTNET_FALLBACK_RPC_URL, "https://blockscout.com/optimism/goerli/tx/", + OPTIMISM_GOERLI_TEST_ID, false)); + put(ARBITRUM_GOERLI_TEST_ID, new NetworkInfo("Arbitrum Goerli (Test)", "AGOR", OPTIMISM_GOERLI_TESTNET_FALLBACK_RPC_URL, "https://goerli-rollup-explorer.arbitrum.io/tx/", + ARBITRUM_GOERLI_TEST_ID, false)); + put(IOTEX_MAINNET_ID, new NetworkInfo("IoTeX","IOTX", IOTEX_MAINNET_RPC_URL, "https://iotexscan.io/tx/", + IOTEX_MAINNET_ID, false)); + put(IOTEX_TESTNET_ID, new NetworkInfo("IoTeX (Test)","IOTX", IOTEX_TESTNET_RPC_URL, "https://testnet.iotexscan.io/tx/", + IOTEX_TESTNET_ID, false)); } };