- update to use Infura gas provider if available.

app/build.gradle

@@ -90,7 +90,7 @@ android {
         def DEFUALT_WALLETCONNECT_PROJECT_ID = "\"40c6071febfd93f4fe485c232a8a4cd9\""
         def DEFAULT_AURORA_API_KEY = "\"HFDDY5BNKGXBB82DE2G8S64C3C41B76PYI\""; //Put your Aurorascan.dev API key here - this one will rate limit as it is common
 
-        buildConfigField 'int', 'DB_VERSION', '53'
+        buildConfigField 'int', 'DB_VERSION', '54'
 
         buildConfigField "String", XInfuraAPI, DEFAULT_INFURA_API_KEY
         buildConfigField "String", "WALLETCONNECT_PROJECT_ID", DEFUALT_WALLETCONNECT_PROJECT_ID

app/src/main/java/com/alphawallet/app/entity/ActionSheetInterface.java

@@ -1,6 +1,9 @@
 package com.alphawallet.app.entity;
 
+import android.content.Intent;
+
 import androidx.activity.result.ActivityResult;
+import androidx.activity.result.ActivityResultLauncher;
 
 import com.alphawallet.app.web3.entity.Web3Transaction;
 
@@ -58,4 +61,14 @@ default void setSignOnly()
     default void setCurrentGasIndex(ActivityResult result)
     {
     }
+
+    default ActivityResultLauncher<Intent> gasSelectLauncher()
+    {
+        return null;
+    }
+
+    default void gasEstimateReady()
+    {
+
+    }
 }

app/src/main/java/com/alphawallet/app/repository/AWRealmMigration.java

@@ -490,6 +490,18 @@ else if (!realmData.hasField("attestation"))
 
             oldVersion = 53;
         }
+
+        if (oldVersion == 53)
+        {
+            RealmObjectSchema realmData = schema.get("Realm1559Gas");
+            if (realmData != null) schema.remove("Realm1559Gas");
+            schema.create("Realm1559Gas")
+                    .addField("chainId", long.class, FieldAttribute.PRIMARY_KEY)
+                    .addField("timeStamp", long.class)
+                    .addField("resultData", String.class);
+
+            oldVersion = 54;
+        }
     }
 
     @Override

app/src/main/java/com/alphawallet/app/repository/EthereumNetworkBase.java

@@ -879,8 +879,6 @@ public static NetworkInfo getNetwork(long chainId)
         return networkMap.get(chainId);
     }
 
-    // fetches the last transaction nonce; if it's identical to the last used one then increment by one
-    // to ensure we don't get transaction replacement
     @Override
     public Single<BigInteger> getLastTransactionNonce(Web3j web3j, String walletAddress)
     {
@@ -889,7 +887,7 @@ public Single<BigInteger> getLastTransactionNonce(Web3j web3j, String walletAddr
             try
             {
                 EthGetTransactionCount ethGetTransactionCount = web3j
-                        .ethGetTransactionCount(walletAddress, DefaultBlockParameterName.LATEST)
+                        .ethGetTransactionCount(walletAddress, DefaultBlockParameterName.PENDING)
                         .send();
                 return ethGetTransactionCount.getTransactionCount();
             }

app/src/main/java/com/alphawallet/app/repository/TransactionsRealmCache.java

@@ -10,6 +10,7 @@
 import com.alphawallet.app.entity.Transaction;
 import com.alphawallet.app.entity.TransactionMeta;
 import com.alphawallet.app.entity.Wallet;
+import com.alphawallet.app.repository.entity.Realm1559Gas;
 import com.alphawallet.app.repository.entity.RealmAuxData;
 import com.alphawallet.app.repository.entity.RealmNFTAsset;
 import com.alphawallet.app.repository.entity.RealmToken;
@@ -295,6 +296,7 @@ public Single<Boolean> deleteAllForWallet(String currentAddress)
                     r.where(RealmAuxData.class).findAll().deleteAllFromRealm();
                     r.where(RealmNFTAsset.class).findAll().deleteAllFromRealm();
                     r.where(RealmTransfer.class).findAll().deleteAllFromRealm();
+                    r.where(Realm1559Gas.class).findAll().deleteAllFromRealm();
                 });
                 instance.refresh();
             }

app/src/main/java/com/alphawallet/app/repository/entity/Realm1559Gas.java

@@ -24,7 +24,12 @@ public class Realm1559Gas extends RealmObject
     public Map<Integer, EIP1559FeeOracleResult> getResult()
     {
         Type entry = new TypeToken<Map<Integer, EIP1559FeeOracleResult>>() {}.getType();
-        return new Gson().fromJson(resultData, entry);
+        return new Gson().fromJson(getResultData(), entry);
+    }
+
+    public String getResultData()
+    {
+        return resultData;
     }
 
     public void setResultData(Map<Integer, EIP1559FeeOracleResult> result, long ts)

app/src/main/java/com/alphawallet/app/service/GasService.java

@@ -304,13 +304,14 @@ private boolean updateEIP1559Realm(final Map<Integer, EIP1559FeeOracleResult> re
                 Realm1559Gas rgs = r.where(Realm1559Gas.class)
                         .equalTo("chainId", chainId)
                         .findFirst();
+
                 if (rgs == null)
                 {
                     rgs = r.createObject(Realm1559Gas.class, chainId);
                 }
 
                 rgs.setResultData(result, System.currentTimeMillis());
-                r.insertOrUpdate(rgs);
+                //r.insertOrUpdate(rgs);
             });
         }
         catch (Exception e)

app/src/main/java/com/alphawallet/app/ui/widget/entity/GasWidgetInterface.java

@@ -28,4 +28,10 @@ public interface GasWidgetInterface
     void setupResendSettings(ActionSheetMode mode, BigInteger gasPrice);
     void setCurrentGasIndex(int gasSelectionIndex, BigInteger maxFeePerGas, BigInteger maxPriorityFee, BigDecimal customGasLimit, long expectedTxTime, long customNonce);
     long getExpectedTransactionTime();
+    default boolean gasPriceReady(long gasEstimateTime)
+    {
+        return gasEstimateTime > (System.currentTimeMillis() - 30 * 1000);
+    }
+
+    boolean gasPriceReady();
 }

app/src/main/java/com/alphawallet/app/widget/ActionSheetDialog.java

@@ -10,6 +10,7 @@
 import android.widget.Toast;
 
 import androidx.activity.result.ActivityResult;
+import androidx.activity.result.ActivityResultLauncher;
 import androidx.annotation.NonNull;
 import androidx.preference.PreferenceManager;
 
@@ -89,7 +90,6 @@ public class ActionSheetDialog extends ActionSheet implements StandardFunctionIn
     private boolean use1559Transactions = false;
     private Transaction transaction;
     private final WalletType walletType;
-    private Disposable disposable;
 
     public ActionSheetDialog(@NonNull Activity activity, Web3Transaction tx, Token t,
                              String destName, String destAddress, TokensService ts,
@@ -329,14 +329,14 @@ private GasWidgetInterface setupGasWidget()
 
         if (use1559Transactions)
         {
-            gasWidget.setupWidget(tokensService, token, candidateTransaction, actionSheetCallback.gasSelectLauncher());
+            gasWidget.setupWidget(tokensService, token, candidateTransaction, this);
             return gasWidget;
         }
         else
         {
             gasWidget.setVisibility(View.GONE);
             gasWidgetLegacy.setVisibility(View.VISIBLE);
-            gasWidgetLegacy.setupWidget(tokensService, token, candidateTransaction, this, actionSheetCallback.gasSelectLauncher());
+            gasWidgetLegacy.setupWidget(tokensService, token, candidateTransaction, this, this);
             return gasWidgetLegacy;
         }
     }
@@ -434,6 +434,13 @@ public void updateAmount()
     @SuppressWarnings("checkstyle:MissingSwitchDefault")
     public void handleClick(String action, int id)
     {
+        //first ensure gas estimate is up to date
+        if (gasEstimateOutOfDate())
+        {
+            functionBar.setPrimaryButtonWaiting();
+            return;
+        }
+
         if (walletType == WalletType.HARDWARE)
         {
             //TODO: Hardware - Maybe flick a toast to tell user to apply card
@@ -477,6 +484,23 @@ public void handleClick(String action, int id)
         }
     }
 
+    @Override
+    public void gasEstimateReady()
+    {
+        functionBar.setPrimaryButtonEnabled(true);
+    }
+
+    @Override
+    public ActivityResultLauncher<Intent> gasSelectLauncher()
+    {
+        return actionSheetCallback.gasSelectLauncher();
+    }
+
+    private boolean gasEstimateOutOfDate()
+    {
+        return !gasWidget.gasPriceReady();
+    }
+
     private BigDecimal getTransactionAmount()
     {
         BigDecimal txAmount;

app/src/main/java/com/alphawallet/app/widget/GasWidget.java

@@ -11,11 +11,10 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import androidx.activity.result.ActivityResultLauncher;
-
 import com.alphawallet.app.BuildConfig;
 import com.alphawallet.app.C;
 import com.alphawallet.app.R;
+import com.alphawallet.app.entity.ActionSheetInterface;
 import com.alphawallet.app.entity.GasPriceSpread;
 import com.alphawallet.app.entity.StandardFunctionInterface;
 import com.alphawallet.app.entity.TXSpeed;
@@ -70,6 +69,8 @@ public class GasWidget extends LinearLayout implements Runnable, GasWidgetInterf
     private long customNonce = -1;
     private boolean isSendingAll;
     private BigInteger resendGasPrice = BigInteger.ZERO;
+    long gasEstimateTime = 0;
+    private ActionSheetInterface actionSheetInterface;
 
     public GasWidget(Context ctx, AttributeSet attrs)
     {
@@ -85,7 +86,7 @@ public GasWidget(Context ctx, AttributeSet attrs)
     //For legacy transaction, either we are sending all or the chain doesn't support EIP1559
     //Since these chains are not so well used, we will compromise and send at the standard gas rate
     //That is - not allow selection of gas price
-    public void setupWidget(TokensService svs, Token t, Web3Transaction tx, StandardFunctionInterface sfi, ActivityResultLauncher<Intent> gasSelectLauncher)
+    public void setupWidget(TokensService svs, Token t, Web3Transaction tx, StandardFunctionInterface sfi, ActionSheetInterface actionSheetIf)
     {
         tokensService = svs;
         token = t;
@@ -96,6 +97,7 @@ public void setupWidget(TokensService svs, Token t, Web3Transaction tx, Standard
         isSendingAll = isSendingAll(tx);
         initialGasPrice = tx.gasPrice;
         customNonce = tx.nonce;
+        actionSheetInterface = actionSheetIf;
 
         if (tx.gasLimit.equals(BigInteger.ZERO)) //dapp didn't specify a limit, use default limits until node returns an estimate (see setGasEstimate())
         {
@@ -133,22 +135,27 @@ public void setupWidget(TokensService svs, Token t, Web3Transaction tx, Standard
                 intent.putExtra(C.EXTRA_NONCE, customNonce);
                 intent.putExtra(C.EXTRA_1559_TX, false);
                 intent.putExtra(C.EXTRA_MIN_GAS_PRICE, resendGasPrice.longValue());
-                gasSelectLauncher.launch(intent);
+                actionSheetInterface.gasSelectLauncher().launch(intent);
             });
         }
     }
 
     private void setupGasSpeeds(Web3Transaction w3tx)
     {
-        RealmGasSpread rgs = getGasQuery().findFirst();
-        if (rgs != null)
-        {
-            initGasSpeeds(rgs);
-        }
-        else
+        try (Realm realm = tokensService.getTickerRealmInstance())
         {
-            // Couldn't get current gas. Add a blank custom gas speed node
-            gasSpread = new GasPriceSpread(getContext(), w3tx.gasPrice);
+            RealmGasSpread gasReturn = realm.where(RealmGasSpread.class)
+                    .equalTo("chainId", token.tokenInfo.chainId).findFirst();
+
+            if (gasReturn != null)
+            {
+                initGasSpeeds(gasReturn);
+            }
+            else
+            {
+                // Couldn't get current gas. Add a blank custom gas speed node
+                gasSpread = new GasPriceSpread(getContext(), w3tx.gasPrice);
+            }
         }
 
         if (w3tx.gasPrice.compareTo(BigInteger.ZERO) > 0)
@@ -301,6 +308,8 @@ private void initGasSpeeds(RealmGasSpread rgs)
 
             TextView editTxt = findViewById(R.id.edit_text);
 
+            gasEstimateTime = rgs.getTimeStamp();
+
             if (gasSpread.hasLockedGas() && editTxt.getVisibility() == View.VISIBLE)
             {
                 findViewById(R.id.edit_text).setVisibility(View.GONE);
@@ -383,6 +392,16 @@ public void run()
         }
         checkSufficientGas();
         manageWarnings();
+
+        if (gasPriceReady(gasEstimateTime))
+        {
+            actionSheetInterface.gasEstimateReady();
+            setGasReadyStatus(true);
+        }
+        else
+        {
+            setGasReadyStatus(false);
+        }
     }
 
     @Override
@@ -399,6 +418,12 @@ public BigInteger getGasPrice(BigInteger defaultPrice)
         }
     }
 
+    @Override
+    public boolean gasPriceReady()
+    {
+        return gasPriceReady(gasEstimateTime);
+    }
+
     @Override
     public BigInteger getValue()
     {
@@ -447,6 +472,12 @@ else if (dGasPrice > 2.0 * upperBound)
         }
     }
 
+    private void setGasReadyStatus(boolean ready)
+    {
+        findViewById(R.id.view_spacer).setVisibility(ready ? View.VISIBLE : View.GONE);
+        findViewById(R.id.gas_fetch_wait).setVisibility(ready ? View.GONE : View.VISIBLE);
+    }
+
     private void showCustomSpeedWarning(boolean high)
     {
         if (currentGasSpeedIndex != TXSpeed.CUSTOM)