fix types

bloomwalletio · May 17, 2024 · 09bcf47 · 09bcf47
1 parent bb307c7
commit 09bcf47
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/...es/shared/src/lib/core/activity/utils/evm/generateEvmActivityFromBlockscoutTransaction.ts b/...es/shared/src/lib/core/activity/utils/evm/generateEvmActivityFromBlockscoutTransaction.ts
@@ -124,7 +124,7 @@ async function generateBaseEvmActivityFromBlockscoutTransaction(
             recipient: blockscoutTransaction.to.hash.toLowerCase(),
             from: blockscoutTransaction.from.hash.toLowerCase(),
             gasUsed: Number(blockscoutTransaction.gas_used),
-            estimatedGas: localTransaction?.estimatedGas,
+            estimatedGas: localTransaction?.estimatedGas ? BigInt(localTransaction.estimatedGas) : undefined,
             gasPrice: blockscoutTransaction.gas_price,
             transactionHash: blockscoutTransaction.hash,
             timestamp: new Date(blockscoutTransaction.timestamp).getTime(),

diff --git a/...ages/shared/src/lib/core/activity/utils/evm/generateEvmActivityFromLocalEvmTransaction.ts b/...ages/shared/src/lib/core/activity/utils/evm/generateEvmActivityFromLocalEvmTransaction.ts
@@ -34,7 +34,7 @@ export async function generateEvmActivityFromLocalEvmTransaction(
                 recipient: transferInfo.recipientAddress ?? to?.toString().toLowerCase(),
                 from: from?.toString().toLowerCase(),
                 gasUsed: Number(gasUsed),
-                estimatedGas,
+                estimatedGas: estimatedGas ? BigInt(estimatedGas) : undefined,
                 gasPrice: gasPrice ?? undefined,
                 transactionHash,
                 timestamp,
@@ -94,7 +94,7 @@ export async function generateEvmActivityFromLocalEvmTransaction(
                 recipient: to?.toString().toLowerCase(),
                 from: from?.toString().toLowerCase(),
                 gasUsed: Number(gasUsed),
-                estimatedGas,
+                estimatedGas: estimatedGas ? BigInt(estimatedGas) : undefined,
                 gasPrice: gasPrice ?? undefined,
                 transactionHash,
                 timestamp,

diff --git a/packages/shared/src/lib/core/transactions/types/local-evm-transaction.interface.ts b/packages/shared/src/lib/core/transactions/types/local-evm-transaction.interface.ts
@@ -1,11 +1,15 @@
 import { EvmTransactionData } from '@core/layer-2/types'
 
-export type LocalEvmTransaction = EvmTransactionData & {
+// estimatedGas, gasLimit and nonce has to be a `number` instead of `biging` because bigints cannot be stored in local storage
+export type LocalEvmTransaction = Omit<EvmTransactionData, 'estimatedGas' | 'gasLimit' | 'nonce'> & {
     status: boolean
     transactionHash: string
     transactionIndex: number
     blockNumber: number
     to: string
     from: string
     gasUsed: number
+    estimatedGas?: number
+    gasLimit?: number
+    nonce?: number
 }
diff --git a/packages/shared/src/lib/core/wallet/actions/send/sendAndPersistTransactionFromEvm.ts b/packages/shared/src/lib/core/wallet/actions/send/sendAndPersistTransactionFromEvm.ts
@@ -40,6 +40,9 @@ export async function sendAndPersistTransactionFromEvm(
         to: transactionReceipt.to,
         from: transactionReceipt.from,
         gasUsed: Number(transactionReceipt.gasUsed),
+        estimatedGas: Number(preparedTransaction.estimatedGas),
+        nonce: Number(preparedTransaction.nonce),
+        gasLimit: Number(preparedTransaction.gasLimit),
         timestamp: Date.now(),
     }
     await persistEvmTransaction(profileId, account, evmNetwork, evmTransaction)