@toruslabs/ethereum-controllers 5.2.13 → 5.2.15

package/dist/types/utils/interfaces.d.ts

@@ -316,7 +316,7 @@ export interface TransactionPayload {
     currency_amount: string;
     selected_currency: string;
     status?: TransactionStatus;
-    network: string;
+    chain_id: string;
     transaction_hash: string;
     transaction_category: string;
     gas: string;
@@ -354,7 +354,7 @@ export interface FormattedTransactionActivity {
     etherscanLink: string;
     ethRate: string;
     currencyUsed: string;
-    networkType: string;
+    chainId: string;
     type: string;
     type_name: string;
     type_image_link: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toruslabs/ethereum-controllers",
-  "version": "5.2.13",
+  "version": "5.2.15",
   "homepage": "https://github.com/torusresearch/controllers#readme",
   "license": "ISC",
   "main": "dist/ethereumControllers.cjs.js",
@@ -24,9 +24,9 @@
     "@ethereumjs/util": "^9.0.1",
     "@metamask/eth-sig-util": "^7.0.1",
     "@metamask/rpc-errors": "^6.1.0",
-    "@toruslabs/base-controllers": "^5.2.12",
+    "@toruslabs/base-controllers": "^5.2.15",
     "@toruslabs/http-helpers": "^6.0.0",
-    "@toruslabs/openlogin-jrpc": "^6.2.3",
+    "@toruslabs/openlogin-jrpc": "^6.2.4",
     "async-mutex": "^0.4.1",
     "bignumber.js": "^9.1.2",
     "bn.js": "^5.2.1",
@@ -64,7 +64,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ff1f86a9f2c01898e1df8ea7f58ee919e88164de",
+  "gitHead": "94fa568058975305722cfc9c7d41c6353d107e61",
   "devDependencies": {
     "@nomicfoundation/hardhat-toolbox": "^4.0.0",
     "hardhat": "^2.19.4"

package/src/Preferences/PreferencesController.ts

@@ -170,7 +170,7 @@ export default class PreferencesController
   public async patchNewTx(tx: TransactionPayload, address: string): Promise<void> {
     const formattedTx = formatPastTx(tx);
     const storePastTx = this.getAddressState(address)?.formattedPastTransactions;
-    const duplicateIndex = storePastTx.findIndex((x) => x.transaction_hash === tx.transaction_hash && x.networkType === tx.network);
+    const duplicateIndex = storePastTx.findIndex((x) => x.transaction_hash === tx.transaction_hash && x.chainId === tx.chain_id);
     if (tx.status === TransactionStatus.submitted || tx.status === TransactionStatus.confirmed) {
       if (duplicateIndex === -1) {
         // No duplicate found
@@ -385,7 +385,7 @@ export default class PreferencesController
     const lowerCaseSelectedAddress = address.toLowerCase();
     for (const x of txs) {
       if (
-        x.network === SUPPORTED_NETWORKS[this.getProviderConfig().chainId].chainId &&
+        x.chain_id === SUPPORTED_NETWORKS[this.getProviderConfig().chainId].chainId &&
         x.to &&
         x.from &&
         (lowerCaseSelectedAddress === x.from.toLowerCase() || lowerCaseSelectedAddress === x.to.toLowerCase())
@@ -405,7 +405,7 @@ export default class PreferencesController
       finalObject.status = resolvedTxStatuses[index] || TransactionStatus.submitted;
       pastTx.push(finalObject);
       if (lowerCaseSelectedAddress === element.from.toLowerCase() && finalObject.status && finalObject.status !== element.status)
-        this.patchPastTx({ id: element.id, status: finalObject.status, updated_at: new Date().toISOString() }, address);
+        this.patchPastTx({ id: element.id, status: finalObject.status }, address);
     }
 
     const finalTx = this.cancelTxCalculate(pastTx);

package/src/utils/helpers.ts

@@ -51,8 +51,8 @@ export const formatPastTx = (x: TransactionPayload, lowerCaseSelectedAddress?: s
     currencyAmountString,
     amount: `${totalAmountString} / ${currencyAmountString}`,
     status: x.status,
-    etherscanLink: getEtherScanHashLink(x.transaction_hash, x.network || MAINNET_CHAIN_ID),
-    networkType: x.network,
+    etherscanLink: getEtherScanHashLink(x.transaction_hash, x.chain_id || MAINNET_CHAIN_ID),
+    chainId: x.chain_id,
     ethRate:
       Number.parseFloat(x?.total_amount) && Number.parseFloat(x?.currency_amount)
         ? `1 ${x.symbol} = ${significantDigits(Number.parseFloat(x.currency_amount) / Number.parseFloat(x.total_amount))}`

package/src/utils/interfaces.ts

@@ -380,7 +380,7 @@ export interface TransactionPayload {
   currency_amount: string;
   selected_currency: string;
   status?: TransactionStatus;
-  network: string;
+  chain_id: string;
   transaction_hash: string;
   transaction_category: string;
   gas: string;
@@ -421,7 +421,7 @@ export interface FormattedTransactionActivity {
   etherscanLink: string;
   ethRate: string;
   currencyUsed: string;
-  networkType: string;
+  chainId: string;
   type: string;
   type_name: string;
   type_image_link: string;