@toruslabs/ethereum-controllers 4.10.0 → 4.11.0

package/dist/types/Preferences/PreferencesController.d.ts

@@ -32,6 +32,7 @@ export default class PreferencesController extends BasePreferencesController<Ext
         type?: string;
         signatures?: string[];
         network?: string;
+        web3AuthClientId?: string;
     }): Promise<void>;
     getSelectedAddress(): string;
     sync(address: string): Promise<boolean>;
@@ -46,6 +47,7 @@ export default class PreferencesController extends BasePreferencesController<Ext
     getSimpleHashNfts(address: string, chainId: string): Promise<CustomNftInfo[]>;
     getCustomTokens(address?: string): CustomToken[];
     getCustomNfts(address?: string): CustomNft[];
+    isChainIdSupported(address: string, chainId: string): boolean;
     addChain(network: AddChainMessageParams): Promise<void>;
     switchChain(data: {
         chainId: string;
@@ -59,7 +61,6 @@ export default class PreferencesController extends BasePreferencesController<Ext
         network: CustomNetworkPayload;
         id: number | null;
     }): Promise<boolean>;
-    private calculatePaymentTx;
     private getChainOptions;
     private calculatePastTx;
     private cancelTxCalculate;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toruslabs/ethereum-controllers",
-  "version": "4.10.0",
+  "version": "4.11.0",
   "homepage": "https://github.com/torusresearch/controllers#readme",
   "license": "ISC",
   "main": "dist/ethereumControllers.cjs.js",
@@ -24,13 +24,13 @@
     "@ethereumjs/util": "^9.0.1",
     "@metamask/eth-sig-util": "^7.0.1",
     "@metamask/rpc-errors": "^6.1.0",
-    "@toruslabs/base-controllers": "^4.10.0",
-    "@toruslabs/http-helpers": "^5.0.0",
+    "@toruslabs/base-controllers": "^4.11.0",
+    "@toruslabs/http-helpers": "^6.0.0",
     "@toruslabs/openlogin-jrpc": "^6.1.0",
     "async-mutex": "^0.4.0",
     "bignumber.js": "^9.1.2",
     "bn.js": "^5.2.1",
-    "ethers": "^6.9.0",
+    "ethers": "^6.9.1",
     "fast-json-patch": "^3.1.1",
     "jsonschema": "^1.4.1",
     "lodash": "^4.17.21",
@@ -64,8 +64,9 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7ee3c0223e59edfd3847a8af852630032b060111",
+  "gitHead": "ece0fb5e61005a05f63eb85dd6a76a0c6e108089",
   "devDependencies": {
-    "hardhat": "^2.19.1"
+    "@nomicfoundation/hardhat-toolbox": "^4.0.0",
+    "hardhat": "^2.19.3"
   }
 }

package/src/Preferences/PreferencesController.ts

@@ -1,7 +1,5 @@
+import { stripHexPrefix } from "@ethereumjs/util";
 import {
-  ACTIVITY_ACTION_RECEIVE,
-  ACTIVITY_ACTION_SEND,
-  ACTIVITY_ACTION_TOPUP,
   BasePreferencesController,
   CustomNft,
   CustomToken,
@@ -30,7 +28,6 @@ import type {
   EthereumProviderConfig,
   EthereumUser,
   ExtendedAddressPreferences,
-  FetchCommonTransaction,
   FetchedTransaction,
   FormattedTransactionActivity,
   TransactionPayload,
@@ -98,8 +95,9 @@ export default class PreferencesController
     type?: string;
     signatures?: string[];
     network?: string;
+    web3AuthClientId?: string;
   }): Promise<void> {
-    const { address, jwtToken, calledFromEmbed, userInfo, rehydrate, locale = "en-US", type, signatures, network } = params;
+    const { address, jwtToken, calledFromEmbed, userInfo, rehydrate, locale = "en-US", type, signatures, network, web3AuthClientId } = params;
     await super.init(address, userInfo, jwtToken, { type, email: userInfo.email, signatures, network });
     const { aggregateVerifier, verifier, verifierId } = userInfo || {};
     const userExists = await this.sync(address);
@@ -115,7 +113,13 @@ export default class PreferencesController
       });
     }
     if (!rehydrate)
-      await this.storeUserLogin({ verifier: aggregateVerifier || verifier, verifierId, options: { calledFromEmbed, rehydrate }, address });
+      await this.storeUserLogin({
+        verifier: aggregateVerifier || verifier,
+        verifierId,
+        options: { calledFromEmbed, rehydrate },
+        address,
+        web3AuthClientId,
+      });
   }
 
   public getSelectedAddress(): string {
@@ -163,15 +167,9 @@ export default class PreferencesController
         this.getWalletOrders<FetchedTransaction>(address).catch((error) => {
           log.error("unable to fetch wallet orders", error);
         }),
-        this.getTopUpOrders<FetchCommonTransaction>(address).catch((error) => {
-          log.error("unable to fetch top up orders", error);
-        }),
       ])
         .then((data) => {
-          const [walletTx, paymentTx] = data;
-          if (paymentTx) {
-            this.calculatePaymentTx(paymentTx, address);
-          }
+          const [walletTx] = data;
           // eslint-disable-next-line promise/always-return
           if (walletTx && walletTx.length > 0) {
             this.updateState({ fetchedPastTx: [...walletTx] }, address);
@@ -267,6 +265,12 @@ export default class PreferencesController
     return this.getAddressState(address)?.customNfts ?? [];
   }
 
+  public isChainIdSupported(address: string, chainId: string): boolean {
+    const approveChainOptions = this.getChainOptions(address);
+    const providerConfig = approveChainOptions.find((x) => stripHexPrefix(x.chainId) === chainId);
+    return !!providerConfig;
+  }
+
   public async addChain(network: AddChainMessageParams): Promise<void> {
     const approveChainOptions = this.getChainOptions();
     const providerConfig = approveChainOptions.find((x) => x.chainId === network.chainId);
@@ -358,41 +362,9 @@ export default class PreferencesController
     }
   }
 
-  private calculatePaymentTx(txs: FetchCommonTransaction[], address: string) {
-    const accumulator: FetchCommonTransaction[] = [];
-    for (const x of txs) {
-      let action = "";
-      const lowerCaseAction = x.action.toLowerCase();
-      if (ACTIVITY_ACTION_TOPUP.includes(lowerCaseAction)) action = ACTIVITY_ACTION_TOPUP;
-      else if (ACTIVITY_ACTION_SEND.includes(lowerCaseAction)) action = ACTIVITY_ACTION_SEND;
-      else if (ACTIVITY_ACTION_RECEIVE.includes(lowerCaseAction)) action = ACTIVITY_ACTION_RECEIVE;
-
-      accumulator.push({
-        id: x.id,
-        date: new Date(x.date).toDateString(),
-        from: x.from,
-        slicedFrom: x.slicedFrom,
-        action,
-        to: x.to,
-        slicedTo: x.slicedTo,
-        totalAmount: x.totalAmount,
-        totalAmountString: x.totalAmountString,
-        currencyAmount: x.currencyAmount,
-        currencyAmountString: x.currencyAmountString,
-        amount: x.amount,
-        ethRate: x.ethRate,
-        status: x.status.toLowerCase(),
-        etherscanLink: x.etherscanLink || "",
-        blockExplorerLink: "",
-        currencyUsed: x.currencyUsed,
-      });
-    }
-    this.updateState({ paymentTx: accumulator }, address);
-  }
-
-  private getChainOptions(): EthereumProviderConfig[] {
-    const { selectedAddress, identities } = this.state;
-    const customNetworks = identities[selectedAddress]?.customNetworks ?? [];
+  private getChainOptions(address: string = this.state.selectedAddress): EthereumProviderConfig[] {
+    const { identities } = this.state;
+    const customNetworks = identities[address]?.customNetworks ?? [];
 
     const custom: EthereumProviderConfig[] = Object.values(customNetworks).reduce((chains, network) => {
       const networkItem = {