@toruslabs/ethereum-controllers 5.5.2 → 5.5.3

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

@@ -436,5 +436,8 @@ export interface EtherscanTransaction {
     type_image_link: string;
     chainId: string;
     tokenSymbol: string;
+    tokenName: string;
     tokenID: string;
+    tokenValue: string;
+    tokenDecimal: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toruslabs/ethereum-controllers",
-  "version": "5.5.2",
+  "version": "5.5.3",
   "homepage": "https://github.com/torusresearch/controllers#readme",
   "license": "ISC",
   "main": "dist/ethereumControllers.cjs.js",
@@ -24,7 +24,7 @@
     "@ethereumjs/util": "^9.0.2",
     "@metamask/eth-sig-util": "^7.0.1",
     "@metamask/rpc-errors": "^6.1.0",
-    "@toruslabs/base-controllers": "^5.5.1",
+    "@toruslabs/base-controllers": "^5.5.3",
     "@toruslabs/http-helpers": "^6.0.0",
     "@toruslabs/openlogin-jrpc": "^7.0.0",
     "async-mutex": "^0.4.1",
@@ -64,7 +64,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ba6a8e2124bfe47b5d75a27cda6492a46e09d59d",
+  "gitHead": "f7e579647725a5daef02b33153dadfbdd94c86a6",
   "devDependencies": {
     "@nomicfoundation/hardhat-toolbox": "^4.0.0",
     "hardhat": "^2.19.5"

package/src/Preferences/PreferencesController.ts

@@ -96,7 +96,7 @@ export default class PreferencesController
   }
 
   public async initPreferences(params: InitPreferencesParams): Promise<void> {
-    const { address, jwtToken, calledFromEmbed, userInfo, rehydrate, locale = "en-US", type, signatures, web3AuthClientId, web3AuthNetwork } = params;
+    const { address, jwtToken, calledFromEmbed, userInfo, rehydrate, locale = "en", type, signatures, web3AuthClientId, web3AuthNetwork } = params;
     await super.init({ address, userInfo, idToken: jwtToken, type, metadata: { email: userInfo.email, signatures, network: web3AuthNetwork } });
     const { aggregateVerifier, verifier, verifierId } = userInfo || {};
     const userExists = await this.sync(address);
@@ -185,7 +185,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 storePastTx = this.getAddressState(address)?.formattedPastTransactions || [];
     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) {

package/src/utils/helpers.ts

@@ -9,7 +9,6 @@ import {
 } from "@toruslabs/base-controllers";
 import { SafeEventEmitterProvider } from "@toruslabs/openlogin-jrpc";
 import BigNumber from "bignumber.js";
-import { formatEther } from "ethers";
 import log from "loglevel";
 
 import { determineTransactionType } from "../Transaction/TransactionUtils";
@@ -198,14 +197,26 @@ export const addEtherscanTransactions = async (
   );
 
   const finalTxs = transactionPromises.reduce((accumulator, x) => {
-    const totalAmountString = x.value ? formatEther(x.value) : "";
+    let totalAmountString = x.value ? new BigNumber(x.value).div(new BigNumber(10).pow(new BigNumber(x.tokenDecimal || 18))).toString() : "";
+    let type = CONTRACT_TYPE_ETH;
+    if (x.contractAddress !== "") {
+      if (x.tokenID) {
+        type = x.tokenValue ? CONTRACT_TYPE_ERC1155 : CONTRACT_TYPE_ERC721;
+      } else {
+        type = CONTRACT_TYPE_ERC20;
+      }
+    }
+
+    if (type === CONTRACT_TYPE_ERC1155) {
+      totalAmountString = x.tokenValue;
+    }
 
     const etherscanTransaction: TransactionPayload = {
       etherscanLink: getEtherScanHashLink(x.hash, chainId),
-      type: x.type || SUPPORTED_NETWORKS[chainId]?.ticker || CONTRACT_TYPE_ETH,
+      type,
       type_image_link: x.type_image_link || "n/a",
-      type_name: x.type_name || "n/a",
-      symbol: SUPPORTED_NETWORKS[chainId]?.ticker,
+      type_name: x.tokenName || SUPPORTED_NETWORKS[chainId]?.ticker || "n/a",
+      symbol: x.tokenSymbol || SUPPORTED_NETWORKS[chainId]?.ticker,
       token_id: x.tokenID || "",
       total_amount: totalAmountString,
       created_at: new Date(Number(x.timeStamp) * 1000),
@@ -217,8 +228,8 @@ export const addEtherscanTransactions = async (
       input: x.input,
       contract_address: x.contractAddress,
       transaction_category: x.transaction_category,
-      gas: x.gas,
-      gasPrice: x.gasPrice,
+      gas: `0x${new BigNumber(x.gasUsed || 0, 10).toString(16)}`,
+      gasPrice: `0x${new BigNumber(x.gasPrice || 0, 10).toString(16)}`,
       chain_id: chainId,
       currency_amount: "",
       nonce: x.nonce,

package/src/utils/interfaces.ts

@@ -512,5 +512,8 @@ export interface EtherscanTransaction {
   type_image_link: string;
   chainId: string;
   tokenSymbol: string;
+  tokenName: string;
   tokenID: string;
+  tokenValue: string;
+  tokenDecimal: string;
 }