Merge pull request #580 from secretkeylabs/mahmoud/eng-5128-stxcity-t…

…oken-fails-on-estimate-fees-need-a-fallback-for

[ENG-5128][ENG-5129][ENG-5077] Use Updated Estimate util & remove nonce manipulation

package.json

@@ -43,7 +43,7 @@
     "@react-spring/web": "^9.6.1",
     "@sats-connect/core": "0.2.1",
     "@scure/btc-signer": "1.2.1",
-    "@secretkeylabs/xverse-core": "19.1.0",
+    "@secretkeylabs/xverse-core": "19.3.0",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
     "@stacks/transactions": "6.16.1",

src/app/components/confirmStxTransactionComponent/index.tsx

@@ -15,6 +15,7 @@ import Transport from '@ledgerhq/hw-transport-webusb';
 import { FadersHorizontal } from '@phosphor-icons/react';
 import type { StacksTransaction } from '@secretkeylabs/xverse-core';
 import {
+  estimateStacksTransactionWithFallback,
   getNonce,
   getStxFiatEquivalent,
   microstacksToStx,
@@ -24,7 +25,7 @@ import {
   signTransaction,
   stxToMicrostacks,
 } from '@secretkeylabs/xverse-core';
-import { estimateTransaction, PostConditionMode } from '@stacks/transactions';
+import { PostConditionMode } from '@stacks/transactions';
 import SelectFeeRate from '@ui-components/selectFeeRate';
 import Button from '@ui-library/button';
 import Callout from '@ui-library/callout';
@@ -128,9 +129,8 @@ function ConfirmStxTransactionComponent({
     const fetchStxFees = async () => {
       try {
         setFeesLoading(true);
-        const [low, medium, high] = await estimateTransaction(
-          initialStxTransactions[0].payload,
-          undefined,
+        const [low, medium, high] = await estimateStacksTransactionWithFallback(
+          initialStxTransactions[0],
           selectedNetwork,
         );
 
@@ -224,8 +224,6 @@ function ConfirmStxTransactionComponent({
 
     if (initialStxTransactions.length === 1) {
       const transaction = initialStxTransactions[0];
-      const nonce = await nextBestNonce(selectedAccount.stxAddress, network);
-      transaction.setNonce(nonce);
       const signedContractCall = await signTransaction(
         transaction,
         seed,

src/app/hooks/useRbfTransactionData.ts

@@ -1,5 +1,6 @@
 import useStxWalletData from '@hooks/queries/useStxWalletData';
 import {
+  estimateStacksTransactionWithFallback,
   mempoolApi,
   microstacksToStx,
   rbf,
@@ -9,7 +10,7 @@ import {
   type StacksTransaction,
   type StxTransactionData,
 } from '@secretkeylabs/xverse-core';
-import { deserializeTransaction, estimateTransaction } from '@stacks/transactions';
+import { deserializeTransaction } from '@stacks/transactions';
 import { isLedgerAccount } from '@utils/helper';
 import axios from 'axios';
 import BigNumber from 'bignumber.js';
@@ -137,9 +138,8 @@ const useRbfTransactionData = (transaction?: BtcTransactionData | StxTransaction
       const txRaw: string = await getRawTransaction(transaction.txid, network);
       const unsignedTx: StacksTransaction = deserializeTransaction(txRaw);
 
-      const [slow, medium, high] = await estimateTransaction(
-        unsignedTx.payload,
-        undefined,
+      const [slow, medium, high] = await estimateStacksTransactionWithFallback(
+        unsignedTx,
         selectedNetwork,
       );
 

src/app/screens/sendStx/steps/Step2SelectAmount.tsx

@@ -6,6 +6,7 @@ import useSelectedAccount from '@hooks/useSelectedAccount';
 import useWalletSelector from '@hooks/useWalletSelector';
 import {
   buf2hex,
+  estimateStacksTransactionWithFallback,
   generateUnsignedStxTokenTransferTransaction,
   generateUnsignedTransaction,
   getStxFiatEquivalent,
@@ -14,7 +15,7 @@ import {
   type FungibleToken,
   type StacksTransaction,
 } from '@secretkeylabs/xverse-core';
-import { deserializeTransaction, estimateTransaction } from '@stacks/transactions';
+import { deserializeTransaction } from '@stacks/transactions';
 import SelectFeeRate, { type FeeRates } from '@ui-components/selectFeeRate';
 import Button from '@ui-library/button';
 import Callout from '@ui-library/callout';
@@ -205,9 +206,8 @@ function Step2SelectAmount({
     const fetchStxFees = async () => {
       try {
         const unsignedTx: StacksTransaction = deserializeTransaction(unsignedSendStxTx);
-        const [low, medium, high] = await estimateTransaction(
-          unsignedTx.payload,
-          undefined,
+        const [low, medium, high] = await estimateStacksTransactionWithFallback(
+          unsignedTx,
           selectedNetwork,
         );