@toruslabs/ethereum-controllers 5.2.14 → 5.3.0

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.14",
+  "version": "5.3.0",
   "homepage": "https://github.com/torusresearch/controllers#readme",
   "license": "ISC",
   "main": "dist/ethereumControllers.cjs.js",
@@ -24,7 +24,7 @@
     "@ethereumjs/util": "^9.0.1",
     "@metamask/eth-sig-util": "^7.0.1",
     "@metamask/rpc-errors": "^6.1.0",
-    "@toruslabs/base-controllers": "^5.2.14",
+    "@toruslabs/base-controllers": "^5.3.0",
     "@toruslabs/http-helpers": "^6.0.0",
     "@toruslabs/openlogin-jrpc": "^6.2.4",
     "async-mutex": "^0.4.1",
@@ -64,7 +64,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "eeb6a3bcd6b2c3005451e817975b97adae8b1f60",
+  "gitHead": "d55cc8b2f3322c082e6108778a5bc8d99621a29f",
   "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/constants.ts

@@ -1,3 +1,5 @@
+import { CHAIN_NAMESPACES } from "@toruslabs/base-controllers";
+
 import { EthereumProviderConfig } from "./interfaces";
 
 export const LOCALHOST = "localhost";
@@ -34,6 +36,8 @@ const INFURA_KEY = process.env.VITE_APP_INFURA_PROJECT_KEY;
 
 export const SUPPORTED_NETWORKS: Record<string, EthereumProviderConfig> = {
   [MAINNET_CHAIN_ID]: {
+    chainNamespace: CHAIN_NAMESPACES.EIP155,
+    decimals: 18,
     blockExplorerUrl: "https://etherscan.io",
     chainId: MAINNET_CHAIN_ID,
     displayName: "Ethereum",
@@ -43,6 +47,8 @@ export const SUPPORTED_NETWORKS: Record<string, EthereumProviderConfig> = {
     tickerName: "Ethereum",
   },
   [POLYGON_CHAIN_ID]: {
+    chainNamespace: CHAIN_NAMESPACES.EIP155,
+    decimals: 18,
     blockExplorerUrl: "https://polygonscan.com",
     chainId: POLYGON_CHAIN_ID,
     displayName: "Polygon",
@@ -52,6 +58,8 @@ export const SUPPORTED_NETWORKS: Record<string, EthereumProviderConfig> = {
     tickerName: "Matic Network Token",
   },
   [BSC_MAINNET_CHAIN_ID]: {
+    chainNamespace: CHAIN_NAMESPACES.EIP155,
+    decimals: 18,
     blockExplorerUrl: "https://bscscan.com",
     chainId: BSC_MAINNET_CHAIN_ID,
     displayName: "Binance Smart Chain (BSC)",
@@ -61,6 +69,8 @@ export const SUPPORTED_NETWORKS: Record<string, EthereumProviderConfig> = {
     tickerName: "Binance Coin",
   },
   [AVALANCHE_MAINNET_CHAIN_ID]: {
+    chainNamespace: CHAIN_NAMESPACES.EIP155,
+    decimals: 18,
     blockExplorerUrl: "https://snowtrace.io",
     chainId: AVALANCHE_MAINNET_CHAIN_ID,
     displayName: "Avalanche",
@@ -70,6 +80,8 @@ export const SUPPORTED_NETWORKS: Record<string, EthereumProviderConfig> = {
     tickerName: "Avalanche",
   },
   [OPTIMISM_MAINNET_CHAIN_ID]: {
+    chainNamespace: CHAIN_NAMESPACES.EIP155,
+    decimals: 18,
     blockExplorerUrl: "https://optimistic.etherscan.io",
     chainId: OPTIMISM_MAINNET_CHAIN_ID,
     displayName: "Optimism",
@@ -79,6 +91,8 @@ export const SUPPORTED_NETWORKS: Record<string, EthereumProviderConfig> = {
     tickerName: "Ethereum",
   },
   [CELO_MAINNET_CHAIN_ID]: {
+    chainNamespace: CHAIN_NAMESPACES.EIP155,
+    decimals: 18,
     blockExplorerUrl: "https://explorer.celo.org",
     chainId: CELO_MAINNET_CHAIN_ID,
     displayName: "Celo Mainnet",
@@ -88,6 +102,8 @@ export const SUPPORTED_NETWORKS: Record<string, EthereumProviderConfig> = {
     tickerName: "Celo",
   },
   [ARBITRUM_MAINNET_CHAIN_ID]: {
+    chainNamespace: CHAIN_NAMESPACES.EIP155,
+    decimals: 18,
     blockExplorerUrl: "https://arbiscan.io",
     chainId: ARBITRUM_MAINNET_CHAIN_ID,
     displayName: "Arbitrum One",
@@ -97,6 +113,8 @@ export const SUPPORTED_NETWORKS: Record<string, EthereumProviderConfig> = {
     tickerName: "Ethereum",
   },
   [XDAI_CHAIN_ID]: {
+    chainNamespace: CHAIN_NAMESPACES.EIP155,
+    decimals: 18,
     blockExplorerUrl: "https://gnosis.blockscout.com",
     chainId: XDAI_CHAIN_ID,
     displayName: "xDai",
@@ -106,6 +124,8 @@ export const SUPPORTED_NETWORKS: Record<string, EthereumProviderConfig> = {
     tickerName: "xDai Token",
   },
   [BASE_CHAIN_ID]: {
+    chainNamespace: CHAIN_NAMESPACES.EIP155,
+    decimals: 18,
     blockExplorerUrl: "https://basescan.org",
     chainId: BASE_CHAIN_ID,
     displayName: "Base",
@@ -115,6 +135,8 @@ export const SUPPORTED_NETWORKS: Record<string, EthereumProviderConfig> = {
     tickerName: "Ethereum",
   },
   [SEPOLIA_CHAIN_ID]: {
+    chainNamespace: CHAIN_NAMESPACES.EIP155,
+    decimals: 18,
     blockExplorerUrl: "https://sepolia.etherscan.io",
     chainId: SEPOLIA_CHAIN_ID,
     displayName: "Sepolia Test Network",
@@ -125,6 +147,8 @@ export const SUPPORTED_NETWORKS: Record<string, EthereumProviderConfig> = {
     isTestnet: true,
   },
   [POLYGON_MUMBAI_CHAIN_ID]: {
+    chainNamespace: CHAIN_NAMESPACES.EIP155,
+    decimals: 18,
     blockExplorerUrl: "https://mumbai.polygonscan.com",
     chainId: POLYGON_MUMBAI_CHAIN_ID,
     displayName: "Polygon Mumbai",
@@ -135,6 +159,8 @@ export const SUPPORTED_NETWORKS: Record<string, EthereumProviderConfig> = {
     isTestnet: true,
   },
   [BSC_TESTNET_CHAIN_ID]: {
+    chainNamespace: CHAIN_NAMESPACES.EIP155,
+    decimals: 18,
     blockExplorerUrl: "https://testnet.bscscan.com",
     chainId: BSC_TESTNET_CHAIN_ID,
     displayName: "Binance Smart Chain Testnet",
@@ -145,6 +171,8 @@ export const SUPPORTED_NETWORKS: Record<string, EthereumProviderConfig> = {
     isTestnet: true,
   },
   [AVALANCHE_TESTNET_CHAIN_ID]: {
+    chainNamespace: CHAIN_NAMESPACES.EIP155,
+    decimals: 18,
     blockExplorerUrl: "https://testnet.snowtrace.io",
     chainId: AVALANCHE_TESTNET_CHAIN_ID,
     displayName: "Avalanche Testnet C-Chain",
@@ -155,6 +183,8 @@ export const SUPPORTED_NETWORKS: Record<string, EthereumProviderConfig> = {
     isTestnet: true,
   },
   [ARBITRUM_TESTNET_CHAIN_ID]: {
+    chainNamespace: CHAIN_NAMESPACES.EIP155,
+    decimals: 18,
     blockExplorerUrl: "https://sepolia.arbiscan.io",
     chainId: ARBITRUM_TESTNET_CHAIN_ID,
     displayName: "Arbitrum Sepolia",
@@ -165,6 +195,8 @@ export const SUPPORTED_NETWORKS: Record<string, EthereumProviderConfig> = {
     isTestnet: true,
   },
   [OPTIMISM_TESTNET_CHAIN_ID]: {
+    chainNamespace: CHAIN_NAMESPACES.EIP155,
+    decimals: 18,
     blockExplorerUrl: "https://sepolia-optimistic.etherscan.io",
     chainId: OPTIMISM_TESTNET_CHAIN_ID,
     displayName: "Optimism Sepolia",
@@ -175,6 +207,8 @@ export const SUPPORTED_NETWORKS: Record<string, EthereumProviderConfig> = {
     isTestnet: true,
   },
   [BASE_TESTNET_CHAIN_ID]: {
+    chainNamespace: CHAIN_NAMESPACES.EIP155,
+    decimals: 18,
     blockExplorerUrl: "https://sepolia.basescan.org",
     chainId: BASE_TESTNET_CHAIN_ID,
     displayName: "Base Sepolia",

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;