fix: do not allow sending if failed to request estimategas-onledger (…

…#7696) * fix: do not allow sending if failed to request estimategas-onledger * fix: logic * fix: remove unnecessary try/catch * feat: remove redundant promise resolve & reject
iotaledger · Nov 20, 2023 · c3b62e7 · c3b62e7
1 parent 25b9993
commit c3b62e7
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 32 deletions.
diff --git a/packages/desktop/components/popups/send/SendNftForm.svelte b/packages/desktop/components/popups/send/SendNftForm.svelte
@@ -87,11 +87,8 @@
 
             const outputParams = await getOutputParameters(details)
             preparedOutput = await prepareOutput($selectedAccount.index, outputParams, getDefaultTransactionOptions())
-
-            return Promise.resolve()
         } catch (err) {
             handleError(err)
-            return Promise.reject()
         } finally {
             isPreparingOutput = false
         }

diff --git a/packages/desktop/components/popups/send/SendTokenForm.svelte b/packages/desktop/components/popups/send/SendTokenForm.svelte
@@ -77,11 +77,8 @@
 
             const outputParams = await getOutputParameters(details)
             preparedOutput = await prepareOutput($selectedAccount.index, outputParams, getDefaultTransactionOptions())
-
-            return Promise.resolve()
         } catch (err) {
             handleError(err)
-            return Promise.reject()
         } finally {
             isPreparingOutput = false
         }

diff --git a/packages/shared/lib/core/layer-2/interfaces/index.ts b/packages/shared/lib/core/layer-2/interfaces/index.ts
@@ -1,4 +1,5 @@
 export * from './layer2-asset-allowance.interface'
+export * from './layer2-gas-estimate-payload.interface'
 export * from './layer2-parameters.interface'
 export * from './layer2-smart-contract-call-data.interface'
 export * from './layer2-transfer-allowance-metadata.interface'
diff --git a/packages/shared/lib/core/layer-2/interfaces/layer2-gas-estimate-payload.interface.ts b/packages/shared/lib/core/layer-2/interfaces/layer2-gas-estimate-payload.interface.ts
@@ -0,0 +1,4 @@
+export interface ILayer2GasEstimatePayload {
+    gasBurned?: number
+    gasFeeCharged?: number
+}
diff --git a/packages/shared/lib/core/layer-2/utils/getEstimatedGasForTransferFromTransactionDetails.ts b/packages/shared/lib/core/layer-2/utils/getEstimatedGasForTransferFromTransactionDetails.ts
@@ -1,14 +1,11 @@
-import BigInteger from 'big-integer'
+import { localize } from '@core/i18n'
 import { getActiveProfile } from '@core/profile'
-
-interface GasEstimatePayload {
-    gasBurned?: number
-    gasFeeCharged?: number
-}
+import BigInteger from 'big-integer'
+import { ILayer2GasEstimatePayload } from '../interfaces'
 
 export async function getEstimatedGasForTransferFromTransactionDetails(
     serializedOutputHex: string
-): Promise<GasEstimatePayload> {
+): Promise<ILayer2GasEstimatePayload> {
     const profile = getActiveProfile()
     const chainMetadata = profile.network?.chains?.[0] ?? null
 
@@ -32,8 +29,12 @@ export async function getEstimatedGasForTransferFromTransactionDetails(
             const gasBurned = BigInteger(data.gasBurned as string).toJSNumber()
             const gasFeeCharged = BigInteger(data.gasFeeCharged as string).toJSNumber()
 
-            return { gasBurned, gasFeeCharged }
+            if (gasBurned && gasFeeCharged) {
+                return { gasBurned, gasFeeCharged }
+            }
         }
+
+        throw new Error(localize('error.layer2.estimatedGas'))
     }
 
     return {}

diff --git a/packages/shared/lib/core/wallet/utils/getOutputParameters.ts b/packages/shared/lib/core/wallet/utils/getOutputParameters.ts
@@ -1,4 +1,5 @@
 import { getSelectedAccount, prepareOutput } from '@core/account'
+import { ILayer2GasEstimatePayload } from '@core/layer-2/interfaces'
 import {
     getEstimatedGasForTransferFromTransactionDetails,
     getLayer2MetadataForTransfer,
@@ -51,7 +52,9 @@ function buildOutputParameters(transactionDetails: NewTransactionDetails): Outpu
     }
 }
 
-async function buildOutputParametersForLayer2(transactionDetails: NewTransactionDetails): Promise<OutputParams> {
+async function buildOutputParametersForLayer2(
+    transactionDetails: NewTransactionDetails
+): Promise<OutputParams | undefined> {
     const { expirationDate, timelockDate, layer2Parameters } = transactionDetails ?? {}
     const selectedAccount = getSelectedAccount()
 
@@ -87,7 +90,10 @@ async function buildOutputParametersForLayer2(transactionDetails: NewTransaction
         },
     }
 
-    async function getEstimateData() {
+    async function getEstimateData(): Promise<{
+        outputForEstimate: BasicOutput | NftOutput
+        gasEstimatePayload: ILayer2GasEstimatePayload
+    }> {
         const outputForEstimate = (await prepareOutput(
             selectedAccount.index,
             outputParams,
@@ -103,7 +109,7 @@ async function buildOutputParametersForLayer2(transactionDetails: NewTransaction
 
     let estimatedData = await getEstimateData()
 
-    if (estimatedData.gasEstimatePayload.gasBurned) {
+    if (estimatedData?.gasEstimatePayload?.gasBurned) {
         //  The "+1" is due to an optimization in WASP nodes.
         const metadata = getLayer2MetadataForTransfer(
             transactionDetails,
@@ -113,23 +119,26 @@ async function buildOutputParametersForLayer2(transactionDetails: NewTransaction
             outputParams.features = {}
         }
         outputParams.features.metadata = metadata
+
         estimatedData = await getEstimateData()
-    }
 
-    // Now that we have the gasFeeCharged, update the amount & the tx details
-    if (estimatedData.gasEstimatePayload.gasFeeCharged) {
-        newTransactionDetails.update((state) => {
-            if (state?.layer2Parameters) {
-                state.layer2Parameters.gasBudget = BigInteger(estimatedData.gasEstimatePayload.gasFeeCharged as number)
-            }
-            return state
-        })
-        outputParams.amount = (
-            parseInt(estimatedData.outputForEstimate.amount, 10) + estimatedData.gasEstimatePayload.gasFeeCharged
-        ).toString()
+        if (estimatedData?.gasEstimatePayload?.gasFeeCharged) {
+            // Now that we have the gasFeeCharged, update the amount & the tx details
+            newTransactionDetails.update((state) => {
+                if (state?.layer2Parameters) {
+                    state.layer2Parameters.gasBudget = BigInteger(
+                        estimatedData.gasEstimatePayload.gasFeeCharged as number
+                    )
+                }
+                return state
+            })
+            outputParams.amount = (
+                parseInt(estimatedData.outputForEstimate.amount, 10) + estimatedData.gasEstimatePayload.gasFeeCharged
+            ).toString()
+
+            return outputParams
+        }
     }
-
-    return outputParams
 }
 
 function getAmountFromTransactionDetails(transactionDetails: NewTransactionDetails): string {

diff --git a/packages/shared/locales/en.json b/packages/shared/locales/en.json
@@ -1965,7 +1965,8 @@
             "reservedTagKeyword": "Unable to use reserved tag keyword"
         },
         "layer2": {
-            "layer1Recipient": "A layer 2 transaction cannot be sent to a layer 1 account."
+            "layer1Recipient": "A layer 2 transaction cannot be sent to a layer 1 account.",
+            "estimatedGas": "Failed to estimate gas."
         },
         "node": {
             "invalid": "Please enter a valid URL.",