@toruslabs/ethereum-controllers 7.1.3 → 7.2.1

package/dist/types/Nfts/NftHandler.d.ts

@@ -1,5 +1,6 @@
+import { CustomNftItemInfo } from "@toruslabs/base-controllers";
 import { Provider } from "ethers";
-import { CustomNftInfo, CustomNftItemInfo } from "../utils/interfaces";
+import { EthereumNftInfo as CustomNftInfo } from "../Nfts/INftsController";
 export interface INftOptions {
     contractAddress: string;
     contractName?: string;

package/dist/types/Nfts/NftsController.d.ts

@@ -1,18 +1,19 @@
 import { BaseController, INftsController, PreferencesState } from "@toruslabs/base-controllers";
 import { SafeEventEmitterProvider } from "@web3auth/auth";
+import { ExtendedAddressPreferences } from "../Preferences/IPreferencesController";
 import { PreferencesController } from "../Preferences/PreferencesController";
-import { CustomNftInfo, EthereumNetworkState, ExtendedAddressPreferences } from "../utils/interfaces";
-import { NftsControllerConfig, NftsControllerState } from "./INftsController";
+import { EthereumNetworkState } from "../utils/interfaces";
+import { EthereumNftInfo as CustomNftInfo, EthereumNftsControllerConfig, EthereumNftsControllerState } from "./INftsController";
 export interface INftsControllerOptions {
-    config?: Partial<NftsControllerConfig>;
-    state?: Partial<NftsControllerState>;
+    config?: Partial<EthereumNftsControllerConfig>;
+    state?: Partial<EthereumNftsControllerState>;
     provider: SafeEventEmitterProvider;
     getCustomNfts?: PreferencesController["getCustomNfts"];
     getSimpleHashNfts: PreferencesController["getSimpleHashNfts"];
     onPreferencesStateChange: (listener: (preferencesState: PreferencesState<ExtendedAddressPreferences>) => void) => void;
     onNetworkStateChange: (listener: (networkState: EthereumNetworkState) => void) => void;
 }
-export declare class NftsController extends BaseController<NftsControllerConfig, NftsControllerState> implements INftsController<NftsControllerConfig, NftsControllerState> {
+export declare class NftsController extends BaseController<EthereumNftsControllerConfig, EthereumNftsControllerState> implements INftsController<EthereumNftsControllerConfig, EthereumNftsControllerState> {
     name: string;
     private provider;
     private ethersProvider;

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

@@ -0,0 +1,10 @@
+import { AddressPreferences } from "@toruslabs/base-controllers";
+import { CustomNetworks, FetchCommonTransaction, FetchedTransaction, FormattedTransactionActivity } from "../utils/interfaces";
+export interface ExtendedAddressPreferences extends AddressPreferences {
+    eoaAddress?: string;
+    fetchedPastTx?: FetchedTransaction[];
+    formattedPastTransactions?: FormattedTransactionActivity[];
+    paymentTx: FetchCommonTransaction[];
+    customNetworks: CustomNetworks[];
+    etherscanTransactions?: FormattedTransactionActivity[];
+}

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

@@ -2,7 +2,9 @@ import { BasePreferencesController, CustomNft, CustomToken, InitPreferencesParam
 import { SafeEventEmitterProvider } from "@web3auth/auth";
 import { KeyringController } from "../Keyring/KeyringController";
 import { NetworkController } from "../Network/NetworkController";
-import type { AddChainMessageParams, CustomNetworkPayload, CustomNftInfo, CustomTokenInfo, EtherscanTransaction, ExtendedAddressPreferences, TransactionPayload } from "../utils/interfaces";
+import { EthereumNftInfo as CustomNftInfo } from "../Nfts/INftsController";
+import type { AddChainMessageParams, CustomNetworkPayload, CustomTokenInfo, EtherscanTransaction, TransactionPayload } from "../utils/interfaces";
+import { ExtendedAddressPreferences } from "./IPreferencesController";
 export interface IPreferencesControllerOptions {
     config?: Partial<PreferencesConfig> & Pick<PreferencesConfig, "api" | "commonApiHost">;
     state?: Partial<PreferencesState<ExtendedAddressPreferences>>;
@@ -13,6 +15,7 @@ export interface IPreferencesControllerOptions {
     validateSignMessage: (message: string) => Promise<void>;
 }
 export declare class PreferencesController extends BasePreferencesController<ExtendedAddressPreferences, PreferencesConfig, PreferencesState<ExtendedAddressPreferences>> implements IPreferencesController<ExtendedAddressPreferences, PreferencesConfig, PreferencesState<ExtendedAddressPreferences>> {
+    protected chainNamespace: "eip155";
     private _handle?;
     private _mutex;
     private getProviderConfig;
@@ -23,6 +26,7 @@ export declare class PreferencesController extends BasePreferencesController<Ext
     initPreferences(params: InitPreferencesParams & {
         eoaAddress?: string;
         aaProvider?: string;
+        mainAddress?: string;
     }): Promise<void>;
     getSelectedAddress(): string;
     sync(address: string): Promise<boolean>;

package/dist/types/Tokens/TokenRatesController.d.ts

@@ -1,5 +1,6 @@
 import { BaseController, BaseTokenRatesControllerConfig, BaseTokenRatesControllerState, ITokenRatesController, PreferencesState } from "@toruslabs/base-controllers";
-import { CustomTokenInfo, EthereumNetworkState, ExtendedAddressPreferences } from "../utils/interfaces";
+import { ExtendedAddressPreferences } from "../Preferences/IPreferencesController";
+import { CustomTokenInfo, EthereumNetworkState } from "../utils/interfaces";
 import { EthereumTokensControllerState } from "./ITokensController";
 export interface CoinGeckoResponse {
     [address: string]: {

package/dist/types/Tokens/TokensController.d.ts

@@ -1,8 +1,9 @@
 import { BaseController, ITokensController, PreferencesState, UserAddress } from "@toruslabs/base-controllers";
 import { SafeEventEmitterProvider } from "@web3auth/auth";
 import { NetworkController } from "../Network/NetworkController";
+import { ExtendedAddressPreferences } from "../Preferences/IPreferencesController";
 import { PreferencesController } from "../Preferences/PreferencesController";
-import { CustomTokenInfo, EthereumNetworkState, ExtendedAddressPreferences } from "../utils/interfaces";
+import { CustomTokenInfo, EthereumNetworkState } from "../utils/interfaces";
 import { EthereumTokensControllerConfig, EthereumTokensControllerState } from "./ITokensController";
 export interface ITokensControllerOptions {
     config?: Partial<EthereumTokensControllerConfig>;

package/dist/types/index.d.ts

@@ -19,6 +19,7 @@ export { NetworkController } from "./Network/NetworkController";
 export * from "./Nfts/INftsController";
 export * from "./Nfts/NftHandler";
 export * from "./Nfts/NftsController";
+export * from "./Preferences/IPreferencesController";
 export { PreferencesController } from "./Preferences/PreferencesController";
 export * from "./Tokens/ITokensController";
 export * from "./Tokens/TokenHandler";

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

@@ -1,4 +1,4 @@
-import BigNumber from "bignumber.js";
+import { BigNumber } from "bignumber.js";
 type NumericBase = "hex" | "dec" | "BN";
 type EthDenomination = "WEI" | "GWEI" | "ETH";
 type ConverterOptions = {

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

@@ -1,6 +1,6 @@
 import { TransactionStatus } from "@toruslabs/base-controllers";
 import { SafeEventEmitterProvider } from "@web3auth/auth";
-import BigNumber from "bignumber.js";
+import { BigNumber } from "bignumber.js";
 import { EtherscanTransaction, FormattedTransactionActivity, TransactionPayload } from "./interfaces";
 export declare function hexToBn(hex: string): BigNumber;
 export declare function BNToHex(bn: BigNumber): string;

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

@@ -1,4 +1,4 @@
-import { AddressPreferences, BASE_TX_EVENT_TYPE, BaseBlockTrackerState, BaseControllerEvents, BaseTransactionEvents, MESSAGE_EVENTS, MessageStatus, NetworkConfig, NetworkState, PaymentTransaction, PollingBlockTrackerConfig, PopupWhitelabelData, ProviderConfig, TRANSACTION_TYPE, TransactionMeta, TransactionState, TransactionStatus, TX_CONFIRMED_EVENT_TYPE, TX_DROPPED_EVENT_TYPE, TX_EVENTS, TX_FAILED_EVENT_TYPE, TX_WARNING_EVENT_TYPE, User } from "@toruslabs/base-controllers";
+import { BASE_TX_EVENT_TYPE, BaseBlockTrackerState, BaseControllerEvents, BaseFormattedTransactionActivity, BaseTokenInfo, BaseTransactionEvents, MESSAGE_EVENTS, MessageStatus, NetworkConfig, NetworkState, PaymentTransaction, PollingBlockTrackerConfig, PopupWhitelabelData, ProviderConfig, TRANSACTION_TYPE, TransactionMeta, TransactionState, TransactionStatus, TX_CONFIRMED_EVENT_TYPE, TX_DROPPED_EVENT_TYPE, TX_EVENTS, TX_FAILED_EVENT_TYPE, TX_WARNING_EVENT_TYPE, User } from "@toruslabs/base-controllers";
 import { JRPCRequest, Json } from "@web3auth/auth";
 import { MutexInterface } from "async-mutex";
 import { AccessList, TypedDataDomain, TypedDataField } from "ethers";
@@ -6,40 +6,10 @@ import { ToBiconomySmartAccountParameters, toEcdsaKernelSmartAccount, ToLightSma
 import { Client, EIP1193Provider } from "viem";
 import { createBundlerClient, createPaymasterClient, SmartAccount, UserOperationReceipt } from "viem/account-abstraction";
 import { METHOD_TYPES, SMART_ACCOUNT, TRANSACTION_ENVELOPE_TYPES } from "./constants";
-export type CustomTokenInfo = {
-    tokenAddress: string;
-    name: string;
-    chainId: string;
+export type CustomTokenInfo = BaseTokenInfo & {
     erc20: boolean;
-    symbol: string;
-    decimals: string;
-    balance?: string;
     customTokenId?: string;
     isEtherScan?: boolean;
-    logo?: string;
-};
-export type CustomNftItemInfo = {
-    image: string;
-    name: string;
-    tokenBalance: string;
-    description: string;
-    tokenId: string;
-    video?: string;
-    decimals?: string;
-    customNftId?: string;
-};
-export type NftStandardType = "erc721" | "erc1155";
-export type CustomNftInfo = {
-    contractAddress: string;
-    contractName: string;
-    contractSymbol: string;
-    contractImage?: string;
-    contractSupply?: string;
-    contractFallbackLogo?: string;
-    nftStandard: NftStandardType;
-    contractDescription?: string;
-    chainId: string;
-    assets: CustomNftItemInfo[];
 };
 export interface EthereumBlock {
     blockHash: string;
@@ -90,13 +60,6 @@ export type SignTypedDataMessageV4 = {
     domain: TypedDataDomain;
     message: Record<string, unknown>;
 };
-export interface SwitchChainMessageParams extends BaseRequestParams {
-    chainId: string;
-    displayName?: string;
-}
-export interface SwitchChainMessage extends AbstractMessage {
-    messageParams: SwitchChainMessageParams;
-}
 export interface AddChainMessageParams extends BaseRequestParams {
     chainId: string;
     chainName: string;
@@ -364,51 +327,17 @@ export interface FetchedTransaction extends TransactionPayload {
 export interface FetchCommonTransaction extends PaymentTransaction {
     etherscanLink?: string | null;
 }
-export interface FormattedTransactionActivity {
-    id: string;
-    date: string;
-    from: string;
+export interface FormattedTransactionActivity extends BaseFormattedTransactionActivity {
     from_aa_address?: string;
-    slicedFrom: string;
-    to: string;
-    slicedTo: string;
-    action: string;
-    totalAmount: string;
-    totalAmountString: string;
-    currencyAmount: string;
-    currencyAmountString: string;
-    amount: string;
-    status: TransactionStatus;
     etherscanLink: string;
     ethRate: string;
-    currencyUsed: string;
-    chainId: string;
-    type: string;
-    type_name: string;
-    type_image_link: string;
-    transaction_hash: string;
     isEtherscan?: boolean;
-    transaction_category: string;
-    input?: string;
-    contract_address?: string;
-    token_id?: string;
     nonce: string;
-    is_cancel: boolean;
     gas: string;
     gasPrice: string;
-    hasCancel?: boolean;
-    cancelDateInitiated?: string;
     cancelGas?: string;
     cancelGasPrice?: string;
 }
-export interface ExtendedAddressPreferences extends AddressPreferences {
-    eoaAddress?: string;
-    fetchedPastTx?: FetchedTransaction[];
-    formattedPastTransactions?: FormattedTransactionActivity[];
-    paymentTx: FetchCommonTransaction[];
-    customNetworks: CustomNetworks[];
-    etherscanTransactions?: FormattedTransactionActivity[];
-}
 export interface ProviderChangeChannelEventData {
     newNetwork: EthereumProviderConfig;
     whitelabelData: PopupWhitelabelData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toruslabs/ethereum-controllers",
-  "version": "7.1.3",
+  "version": "7.2.1",
   "homepage": "https://github.com/torusresearch/controllers#readme",
   "license": "ISC",
   "sideEffects": false,
@@ -21,9 +21,9 @@
   },
   "dependencies": {
     "@ethereumjs/util": "^9.1.0",
-    "@toruslabs/base-controllers": "^7.1.1",
+    "@toruslabs/base-controllers": "^7.2.1",
     "@toruslabs/http-helpers": "^7.0.0",
-    "@web3auth/auth": "^9.6.2",
+    "@web3auth/auth": "^9.6.4",
     "async-mutex": "^0.5.0",
     "bignumber.js": "^9.1.2",
     "bn.js": "^5.2.1",
@@ -63,7 +63,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6817fcf1b6b9b44c94c278311b711c2c2f4ff72c",
+  "gitHead": "2f3e1955a917f7c3c70218da523bcf12af692f96",
   "devDependencies": {
     "@nomicfoundation/hardhat-chai-matchers": "^2.0.8",
     "@nomicfoundation/hardhat-ethers": "^3.0.8",