@metamask-previews/earn-controller 4.0.0-preview-b31794c → 4.0.0-preview-a8644e5b

package/CHANGELOG.md

@@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- **BREAKING:** Added mandatory parameter `selectedNetworkClientId` to `EarnController` constructor ([#6153](https://github.com/MetaMask/core/pull/6153))
+- **BREAKING:** Added mandatory `chainId` parameter to `executeLendingTokenApprove`, `executeLendingWithdraw`, `executeLendingDeposit`, `getLendingMarketDailyApysAndAverages` and `getLendingPositionHistory` methods ([#6153](https://github.com/MetaMask/core/pull/6153))
+- **BREAKING:** Changed `refreshPooledStakingVaultDailyApys` to accept an options object with `chainId`, `days`, and `order` properties, where `chainId` is a new option, instead of separate parameters `days` and `order` ([#6153](https://github.com/MetaMask/core/pull/6153))
+- Added optional `chainId` parameter to `refreshPooledStakingVaultApyAverages`, `refreshPooledStakingVaultMetadata` and `refreshPooledStakes` (defaults to Ethereum) ([#6153](https://github.com/MetaMask/core/pull/6153))
+
+### Changed
+
+- **BREAKING:** Removed usages of `NetworkController:getState` for GNS removal. Added optional `chainId` parameter to `refreshPooledStakingVaultApyAverages`, `refreshPooledStakingVaultDailyApys`, `refreshPooledStakingVaultMetadata` and `refreshPooledStakes`. ([#6153](https://github.com/MetaMask/core/pull/6153))
+- **BREAKING:** `EarnController` messenger must now allow `NetworkController:networkDidChange` and must not allow `NetworkController:getState` and `NetworkController:stateChange` ([#6153](https://github.com/MetaMask/core/pull/6153))
+- `refreshPooledStakingData` now refreshes for all supported chains, not just global chain ([#6153](https://github.com/MetaMask/core/pull/6153))
+
 ## [4.0.0]
 
 ### Changed

package/dist/EarnController.cjs

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _EarnController_instances, _EarnController_earnSDK, _EarnController_selectedNetworkClientId, _EarnController_earnApiService, _EarnController_addTransactionFn, _EarnController_supportedPooledStakingChains, _EarnController_env, _EarnController_initializeSDK, _EarnController_getCurrentAccount, _EarnController_getCurrentChainId, _EarnController_getActivePooledStakingChainId;
+var _EarnController_instances, _EarnController_earnSDK, _EarnController_selectedNetworkClientId, _EarnController_earnApiService, _EarnController_addTransactionFn, _EarnController_supportedPooledStakingChains, _EarnController_env, _EarnController_initializeSDK, _EarnController_getCurrentAccount;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EarnController = exports.getDefaultEarnControllerState = exports.DEFAULT_POOLED_STAKING_CHAIN_STATE = exports.DEFAULT_POOLED_STAKING_VAULT_APY_AVERAGES = exports.DEFAULT_LENDING_POSITION = exports.DEFAULT_LENDING_MARKET = exports.controllerName = void 0;
 const providers_1 = require("@ethersproject/providers");
@@ -18,7 +18,6 @@ const base_controller_1 = require("@metamask/base-controller");
 const controller_utils_1 = require("@metamask/controller-utils");
 const stake_sdk_1 = require("@metamask/stake-sdk");
 const transaction_controller_1 = require("@metamask/transaction-controller");
-const constants_1 = require("./constants.cjs");
 exports.controllerName = 'EarnController';
 const stakingTransactionTypes = new Set([
     transaction_controller_1.TransactionType.stakingDeposit,
@@ -132,7 +131,7 @@ exports.getDefaultEarnControllerState = getDefaultEarnControllerState;
  * EarnController manages DeFi earning opportunities across different protocols and chains.
  */
 class EarnController extends base_controller_1.BaseController {
-    constructor({ messenger, state = {}, addTransactionFn, env = stake_sdk_1.EarnEnvironments.PROD, }) {
+    constructor({ messenger, state = {}, addTransactionFn, selectedNetworkClientId, env = stake_sdk_1.EarnEnvironments.PROD, }) {
         super({
             name: exports.controllerName,
             metadata: earnControllerMetadata,
@@ -154,30 +153,24 @@ class EarnController extends base_controller_1.BaseController {
         // temporary array of supported chains
         // TODO: remove this once we export a supported chains list from the sdk
         // from sdk or api to get lending and pooled staking chains
-        __classPrivateFieldSet(this, _EarnController_supportedPooledStakingChains, [
-            transaction_controller_1.CHAIN_IDS.MAINNET,
-            constants_1.HOODI_TESTNET_CHAIN_ID_HEX,
-        ], "f");
+        __classPrivateFieldSet(this, _EarnController_supportedPooledStakingChains, [stake_sdk_1.ChainId.ETHEREUM, stake_sdk_1.ChainId.HOODI], "f");
         __classPrivateFieldSet(this, _EarnController_addTransactionFn, addTransactionFn, "f");
-        __classPrivateFieldGet(this, _EarnController_instances, "m", _EarnController_initializeSDK).call(this).catch(console.error);
+        __classPrivateFieldSet(this, _EarnController_selectedNetworkClientId, selectedNetworkClientId, "f");
+        __classPrivateFieldGet(this, _EarnController_instances, "m", _EarnController_initializeSDK).call(this, selectedNetworkClientId).catch(console.error);
         this.refreshPooledStakingData().catch(console.error);
         this.refreshLendingData().catch(console.error);
-        const { selectedNetworkClientId } = this.messagingSystem.call('NetworkController:getState');
-        __classPrivateFieldSet(this, _EarnController_selectedNetworkClientId, selectedNetworkClientId, "f");
         // Listen for network changes
-        this.messagingSystem.subscribe('NetworkController:stateChange', (networkControllerState) => {
-            if (networkControllerState.selectedNetworkClientId !==
-                __classPrivateFieldGet(this, _EarnController_selectedNetworkClientId, "f")) {
-                __classPrivateFieldGet(this, _EarnController_instances, "m", _EarnController_initializeSDK).call(this, networkControllerState.selectedNetworkClientId).catch(console.error);
-                this.refreshPooledStakingVaultMetadata().catch(console.error);
-                this.refreshPooledStakingVaultDailyApys().catch(console.error);
-                this.refreshPooledStakingVaultApyAverages().catch(console.error);
-                this.refreshPooledStakes().catch(console.error);
-                // refresh lending data for all chains
-                this.refreshLendingMarkets().catch(console.error);
-                this.refreshLendingPositions().catch(console.error);
-            }
+        this.messagingSystem.subscribe('NetworkController:networkDidChange', (networkControllerState) => {
             __classPrivateFieldSet(this, _EarnController_selectedNetworkClientId, networkControllerState.selectedNetworkClientId, "f");
+            __classPrivateFieldGet(this, _EarnController_instances, "m", _EarnController_initializeSDK).call(this, __classPrivateFieldGet(this, _EarnController_selectedNetworkClientId, "f")).catch(console.error);
+            // refresh pooled staking data
+            this.refreshPooledStakingVaultMetadata().catch(console.error);
+            this.refreshPooledStakingVaultDailyApys().catch(console.error);
+            this.refreshPooledStakingVaultApyAverages().catch(console.error);
+            this.refreshPooledStakes().catch(console.error);
+            // refresh lending data for all chains
+            this.refreshLendingMarkets().catch(console.error);
+            this.refreshLendingPositions().catch(console.error);
         });
         // Listen for account changes
         this.messagingSystem.subscribe('AccountsController:selectedAccountChange', (account) => {
@@ -222,18 +215,22 @@ class EarnController extends base_controller_1.BaseController {
      * @param options - Optional arguments
      * @param [options.resetCache] - Control whether the BE cache should be invalidated (optional).
      * @param [options.address] - The address to refresh pooled stakes for (optional).
+     * @param [options.chainId] - The chain id to refresh pooled stakes for (optional).
      * @returns A promise that resolves when the stakes data has been updated
      */
-    async refreshPooledStakes({ resetCache = false, address, } = {}) {
+    async refreshPooledStakes({ resetCache = false, address, chainId = stake_sdk_1.ChainId.ETHEREUM, } = {}) {
         const addressToUse = address ?? __classPrivateFieldGet(this, _EarnController_instances, "m", _EarnController_getCurrentAccount).call(this)?.address;
         if (!addressToUse) {
             return;
         }
-        const chainId = __classPrivateFieldGet(this, _EarnController_instances, "m", _EarnController_getActivePooledStakingChainId).call(this);
-        const { accounts, exchangeRate } = await __classPrivateFieldGet(this, _EarnController_earnApiService, "f").pooledStaking.getPooledStakes([addressToUse], chainId, resetCache);
+        const chainIdToUse = (0, stake_sdk_1.isSupportedPooledStakingChain)(chainId)
+            ? chainId
+            : stake_sdk_1.ChainId.ETHEREUM;
+        const { accounts, exchangeRate } = await __classPrivateFieldGet(this, _EarnController_earnApiService, "f").pooledStaking.getPooledStakes([addressToUse], chainIdToUse, resetCache);
         this.update((state) => {
-            const chainState = state.pooled_staking[chainId] ?? exports.DEFAULT_POOLED_STAKING_CHAIN_STATE;
-            state.pooled_staking[chainId] = {
+            const chainState = state.pooled_staking[chainIdToUse] ??
+                exports.DEFAULT_POOLED_STAKING_CHAIN_STATE;
+            state.pooled_staking[chainIdToUse] = {
                 ...chainState,
                 pooledStakes: accounts[0],
                 exchangeRate,
@@ -268,14 +265,18 @@ class EarnController extends base_controller_1.BaseController {
      * Updates the vault metadata in the controller state including APY, capacity,
      * fee percentage, total assets, and vault address.
      *
+     * @param [chainId] - The chain id to refresh pooled staking vault metadata for (optional).
      * @returns A promise that resolves when the vault metadata has been updated
      */
-    async refreshPooledStakingVaultMetadata() {
-        const chainId = __classPrivateFieldGet(this, _EarnController_instances, "m", _EarnController_getActivePooledStakingChainId).call(this);
-        const vaultMetadata = await __classPrivateFieldGet(this, _EarnController_earnApiService, "f").pooledStaking.getVaultData(chainId);
+    async refreshPooledStakingVaultMetadata(chainId = stake_sdk_1.ChainId.ETHEREUM) {
+        const chainIdToUse = (0, stake_sdk_1.isSupportedPooledStakingChain)(chainId)
+            ? chainId
+            : stake_sdk_1.ChainId.ETHEREUM;
+        const vaultMetadata = await __classPrivateFieldGet(this, _EarnController_earnApiService, "f").pooledStaking.getVaultData(chainIdToUse);
         this.update((state) => {
-            const chainState = state.pooled_staking[chainId] ?? exports.DEFAULT_POOLED_STAKING_CHAIN_STATE;
-            state.pooled_staking[chainId] = {
+            const chainState = state.pooled_staking[chainIdToUse] ??
+                exports.DEFAULT_POOLED_STAKING_CHAIN_STATE;
+            state.pooled_staking[chainIdToUse] = {
                 ...chainState,
                 vaultMetadata,
             };
@@ -285,16 +286,21 @@ class EarnController extends base_controller_1.BaseController {
      * Refreshes pooled staking vault daily apys for the current chain.
      * Updates the pooled staking vault daily apys controller state.
      *
-     * @param days - The number of days to fetch pooled staking vault daily apys for (defaults to 365).
-     * @param order - The order in which to fetch pooled staking vault daily apys. Descending order fetches the latest N days (latest working backwards). Ascending order fetches the oldest N days (oldest working forwards) (defaults to 'desc').
+     * @param [options] - The options for refreshing pooled staking vault daily apys.
+     * @param [options.chainId] - The chain id to refresh pooled staking vault daily apys for (defaults to Ethereum).
+     * @param [options.days] - The number of days to fetch pooled staking vault daily apys for (defaults to 365).
+     * @param [options.order] - The order in which to fetch pooled staking vault daily apys. Descending order fetches the latest N days (latest working backwards). Ascending order fetches the oldest N days (oldest working forwards) (defaults to 'desc').
      * @returns A promise that resolves when the pooled staking vault daily apys have been updated.
      */
-    async refreshPooledStakingVaultDailyApys(days = 365, order = 'desc') {
-        const chainId = __classPrivateFieldGet(this, _EarnController_instances, "m", _EarnController_getActivePooledStakingChainId).call(this);
-        const vaultDailyApys = await __classPrivateFieldGet(this, _EarnController_earnApiService, "f").pooledStaking.getVaultDailyApys(chainId, days, order);
+    async refreshPooledStakingVaultDailyApys({ chainId = stake_sdk_1.ChainId.ETHEREUM, days = 365, order = 'desc', } = {}) {
+        const chainIdToUse = (0, stake_sdk_1.isSupportedPooledStakingChain)(chainId)
+            ? chainId
+            : stake_sdk_1.ChainId.ETHEREUM;
+        const vaultDailyApys = await __classPrivateFieldGet(this, _EarnController_earnApiService, "f").pooledStaking.getVaultDailyApys(chainIdToUse, days, order);
         this.update((state) => {
-            const chainState = state.pooled_staking[chainId] ?? exports.DEFAULT_POOLED_STAKING_CHAIN_STATE;
-            state.pooled_staking[chainId] = {
+            const chainState = state.pooled_staking[chainIdToUse] ??
+                exports.DEFAULT_POOLED_STAKING_CHAIN_STATE;
+            state.pooled_staking[chainIdToUse] = {
                 ...chainState,
                 vaultDailyApys,
             };
@@ -304,14 +310,18 @@ class EarnController extends base_controller_1.BaseController {
      * Refreshes pooled staking vault apy averages for the current chain.
      * Updates the pooled staking vault apy averages controller state.
      *
+     * @param [chainId] - The chain id to refresh pooled staking vault apy averages for (optional).
      * @returns A promise that resolves when the pooled staking vault apy averages have been updated.
      */
-    async refreshPooledStakingVaultApyAverages() {
-        const chainId = __classPrivateFieldGet(this, _EarnController_instances, "m", _EarnController_getActivePooledStakingChainId).call(this);
-        const vaultApyAverages = await __classPrivateFieldGet(this, _EarnController_earnApiService, "f").pooledStaking.getVaultApyAverages(chainId);
+    async refreshPooledStakingVaultApyAverages(chainId = stake_sdk_1.ChainId.ETHEREUM) {
+        const chainIdToUse = (0, stake_sdk_1.isSupportedPooledStakingChain)(chainId)
+            ? chainId
+            : stake_sdk_1.ChainId.ETHEREUM;
+        const vaultApyAverages = await __classPrivateFieldGet(this, _EarnController_earnApiService, "f").pooledStaking.getVaultApyAverages(chainIdToUse);
         this.update((state) => {
-            const chainState = state.pooled_staking[chainId] ?? exports.DEFAULT_POOLED_STAKING_CHAIN_STATE;
-            state.pooled_staking[chainId] = {
+            const chainState = state.pooled_staking[chainIdToUse] ??
+                exports.DEFAULT_POOLED_STAKING_CHAIN_STATE;
+            state.pooled_staking[chainIdToUse] = {
                 ...chainState,
                 vaultApyAverages,
             };
@@ -330,23 +340,26 @@ class EarnController extends base_controller_1.BaseController {
      */
     async refreshPooledStakingData({ resetCache, address, } = {}) {
         const errors = [];
-        await Promise.all([
-            this.refreshPooledStakes({ resetCache, address }).catch((error) => {
-                errors.push(error);
-            }),
-            this.refreshEarnEligibility({ address }).catch((error) => {
-                errors.push(error);
-            }),
-            this.refreshPooledStakingVaultMetadata().catch((error) => {
-                errors.push(error);
-            }),
-            this.refreshPooledStakingVaultDailyApys().catch((error) => {
-                errors.push(error);
-            }),
-            this.refreshPooledStakingVaultApyAverages().catch((error) => {
-                errors.push(error);
-            }),
-        ]);
+        // Refresh earn eligibility once since it's not chain-specific
+        await this.refreshEarnEligibility({ address }).catch((error) => {
+            errors.push(error);
+        });
+        for (const chainId of __classPrivateFieldGet(this, _EarnController_supportedPooledStakingChains, "f")) {
+            await Promise.all([
+                this.refreshPooledStakes({ resetCache, address, chainId }).catch((error) => {
+                    errors.push(error);
+                }),
+                this.refreshPooledStakingVaultMetadata(chainId).catch((error) => {
+                    errors.push(error);
+                }),
+                this.refreshPooledStakingVaultDailyApys({ chainId }).catch((error) => {
+                    errors.push(error);
+                }),
+                this.refreshPooledStakingVaultApyAverages(chainId).catch((error) => {
+                    errors.push(error);
+                }),
+            ]);
+        }
         if (errors.length > 0) {
             throw new Error(`Failed to refresh some staking data: ${errors
                 .map((e) => e.message)
@@ -447,7 +460,7 @@ class EarnController extends base_controller_1.BaseController {
      *
      * @param options - Optional arguments
      * @param [options.address] - The address to get lending position history for (optional).
-     * @param [options.chainId] - The chain id to get lending position history for (optional).
+     * @param options.chainId - The chain id to get lending position history for.
      * @param [options.positionId] - The position id to get lending position history for.
      * @param [options.marketId] - The market id to get lending position history for.
      * @param [options.marketAddress] - The market address to get lending position history for.
@@ -457,34 +470,33 @@ class EarnController extends base_controller_1.BaseController {
      */
     getLendingPositionHistory({ address, chainId, positionId, marketId, marketAddress, protocol, days = 730, }) {
         const addressToUse = address ?? __classPrivateFieldGet(this, _EarnController_instances, "m", _EarnController_getCurrentAccount).call(this)?.address;
-        const chainIdToUse = chainId ?? __classPrivateFieldGet(this, _EarnController_instances, "m", _EarnController_getCurrentChainId).call(this);
-        if (!addressToUse || !(0, stake_sdk_1.isSupportedLendingChain)(chainIdToUse)) {
+        if (!addressToUse || !(0, stake_sdk_1.isSupportedLendingChain)(chainId)) {
             return [];
         }
-        return __classPrivateFieldGet(this, _EarnController_earnApiService, "f").lending.getPositionHistory(addressToUse, chainIdToUse, protocol, marketId, marketAddress, positionId, days);
+        return __classPrivateFieldGet(this, _EarnController_earnApiService, "f").lending.getPositionHistory(addressToUse, chainId, protocol, marketId, marketAddress, positionId, days);
     }
     /**
      * Gets the lending market daily apys and averages for the current chain.
      *
      * @param options - Optional arguments
-     * @param [options.chainId] - The chain id to get lending market daily apys and averages for (optional).
+     * @param options.chainId - The chain id to get lending market daily apys and averages for.
      * @param [options.protocol] - The protocol to get lending market daily apys and averages for.
      * @param [options.marketId] - The market id to get lending market daily apys and averages for.
      * @param [options.days] - The number of days to get lending market daily apys and averages for (optional).
      * @returns A promise that resolves when the lending market daily apys and averages have been updated
      */
     getLendingMarketDailyApysAndAverages({ chainId, protocol, marketId, days = 365, }) {
-        const chainIdToUse = chainId ?? __classPrivateFieldGet(this, _EarnController_instances, "m", _EarnController_getCurrentChainId).call(this);
-        if (!(0, stake_sdk_1.isSupportedLendingChain)(chainIdToUse)) {
+        if (!(0, stake_sdk_1.isSupportedLendingChain)(chainId)) {
             return undefined;
         }
-        return __classPrivateFieldGet(this, _EarnController_earnApiService, "f").lending.getHistoricMarketApys(chainIdToUse, protocol, marketId, days);
+        return __classPrivateFieldGet(this, _EarnController_earnApiService, "f").lending.getHistoricMarketApys(chainId, protocol, marketId, days);
     }
     /**
      * Executes a lending deposit transaction.
      *
      * @param options - The options for the lending deposit transaction.
      * @param options.amount - The amount to deposit.
+     * @param options.chainId - The chain ID for the lending deposit transaction.
      * @param options.protocol - The protocol of the lending market.
      * @param options.underlyingTokenAddress - The address of the underlying token.
      * @param options.gasOptions - The gas options for the transaction.
@@ -493,7 +505,7 @@ class EarnController extends base_controller_1.BaseController {
      * @param options.txOptions - The transaction options for the transaction.
      * @returns A promise that resolves to the transaction hash.
      */
-    async executeLendingDeposit({ amount, protocol, underlyingTokenAddress, gasOptions, txOptions, }) {
+    async executeLendingDeposit({ amount, chainId, protocol, underlyingTokenAddress, gasOptions, txOptions, }) {
         const address = __classPrivateFieldGet(this, _EarnController_instances, "m", _EarnController_getCurrentAccount).call(this)?.address;
         const transactionData = await __classPrivateFieldGet(this, _EarnController_earnSDK, "f")?.contracts?.lending?.[protocol]?.[underlyingTokenAddress]?.encodeDepositTransactionData(amount, address, gasOptions);
         if (!transactionData) {
@@ -508,7 +520,7 @@ class EarnController extends base_controller_1.BaseController {
         const txHash = await __classPrivateFieldGet(this, _EarnController_addTransactionFn, "f").call(this, {
             ...transactionData,
             value: transactionData.value.toString(),
-            chainId: (0, controller_utils_1.toHex)(__classPrivateFieldGet(this, _EarnController_instances, "m", _EarnController_getCurrentChainId).call(this)),
+            chainId: (0, controller_utils_1.toHex)(chainId),
             gasLimit,
         }, {
             ...txOptions,
@@ -521,6 +533,7 @@ class EarnController extends base_controller_1.BaseController {
      *
      * @param options - The options for the lending withdraw transaction.
      * @param options.amount - The amount to withdraw.
+     * @param options.chainId - The chain ID for the lending withdraw transaction.
      * @param options.protocol - The protocol of the lending market.
      * @param options.underlyingTokenAddress - The address of the underlying token.
      * @param options.gasOptions - The gas options for the transaction.
@@ -529,7 +542,7 @@ class EarnController extends base_controller_1.BaseController {
      * @param options.txOptions - The transaction options for the transaction.
      * @returns A promise that resolves to the transaction hash.
      */
-    async executeLendingWithdraw({ amount, protocol, underlyingTokenAddress, gasOptions, txOptions, }) {
+    async executeLendingWithdraw({ amount, chainId, protocol, underlyingTokenAddress, gasOptions, txOptions, }) {
         const address = __classPrivateFieldGet(this, _EarnController_instances, "m", _EarnController_getCurrentAccount).call(this)?.address;
         const transactionData = await __classPrivateFieldGet(this, _EarnController_earnSDK, "f")?.contracts?.lending?.[protocol]?.[underlyingTokenAddress]?.encodeWithdrawTransactionData(amount, address, gasOptions);
         if (!transactionData) {
@@ -544,7 +557,7 @@ class EarnController extends base_controller_1.BaseController {
         const txHash = await __classPrivateFieldGet(this, _EarnController_addTransactionFn, "f").call(this, {
             ...transactionData,
             value: transactionData.value.toString(),
-            chainId: (0, controller_utils_1.toHex)(__classPrivateFieldGet(this, _EarnController_instances, "m", _EarnController_getCurrentChainId).call(this)),
+            chainId: (0, controller_utils_1.toHex)(chainId),
             gasLimit,
         }, {
             ...txOptions,
@@ -557,6 +570,7 @@ class EarnController extends base_controller_1.BaseController {
      *
      * @param options - The options for the lending token approve transaction.
      * @param options.amount - The amount to approve.
+     * @param options.chainId - The chain ID for the lending token approve transaction.
      * @param options.protocol - The protocol of the lending market.
      * @param options.underlyingTokenAddress - The address of the underlying token.
      * @param options.gasOptions - The gas options for the transaction.
@@ -565,7 +579,7 @@ class EarnController extends base_controller_1.BaseController {
      * @param options.txOptions - The transaction options for the transaction.
      * @returns A promise that resolves to the transaction hash.
      */
-    async executeLendingTokenApprove({ protocol, amount, underlyingTokenAddress, gasOptions, txOptions, }) {
+    async executeLendingTokenApprove({ protocol, amount, chainId, underlyingTokenAddress, gasOptions, txOptions, }) {
         const address = __classPrivateFieldGet(this, _EarnController_instances, "m", _EarnController_getCurrentAccount).call(this)?.address;
         const transactionData = await __classPrivateFieldGet(this, _EarnController_earnSDK, "f")?.contracts?.lending?.[protocol]?.[underlyingTokenAddress]?.encodeUnderlyingTokenApproveTransactionData(amount, address, gasOptions);
         if (!transactionData) {
@@ -580,7 +594,7 @@ class EarnController extends base_controller_1.BaseController {
         const txHash = await __classPrivateFieldGet(this, _EarnController_addTransactionFn, "f").call(this, {
             ...transactionData,
             value: transactionData.value.toString(),
-            chainId: (0, controller_utils_1.toHex)(__classPrivateFieldGet(this, _EarnController_instances, "m", _EarnController_getCurrentChainId).call(this)),
+            chainId: (0, controller_utils_1.toHex)(chainId),
             gasLimit,
         }, {
             ...txOptions,
@@ -630,13 +644,10 @@ _EarnController_earnSDK = new WeakMap(), _EarnController_selectedNetworkClientId
 /**
  * Initializes the Earn SDK.
  *
- * @param networkClientId - The network client id to initialize the Earn SDK for (optional).
+ * @param networkClientId - The network client id to initialize the Earn SDK for.
  */
 async function _EarnController_initializeSDK(networkClientId) {
-    const { selectedNetworkClientId } = networkClientId
-        ? { selectedNetworkClientId: networkClientId }
-        : this.messagingSystem.call('NetworkController:getState');
-    const networkClient = this.messagingSystem.call('NetworkController:getNetworkClientById', selectedNetworkClientId);
+    const networkClient = this.messagingSystem.call('NetworkController:getNetworkClientById', networkClientId);
     if (!networkClient?.provider) {
         __classPrivateFieldSet(this, _EarnController_earnSDK, null, "f");
         return;
@@ -661,19 +672,5 @@ async function _EarnController_initializeSDK(networkClientId) {
     }
 }, _EarnController_getCurrentAccount = function _EarnController_getCurrentAccount() {
     return this.messagingSystem.call('AccountsController:getSelectedAccount');
-}, _EarnController_getCurrentChainId = function _EarnController_getCurrentChainId(networkClientId) {
-    const networkClientIdToUse = networkClientId ??
-        this.messagingSystem.call('NetworkController:getState')
-            .selectedNetworkClientId;
-    const { configuration: { chainId }, } = this.messagingSystem.call('NetworkController:getNetworkClientById', networkClientIdToUse);
-    return (0, controller_utils_1.convertHexToDecimal)(chainId);
-}, _EarnController_getActivePooledStakingChainId = function _EarnController_getActivePooledStakingChainId() {
-    const activeChainId = __classPrivateFieldGet(this, _EarnController_instances, "m", _EarnController_getCurrentChainId).call(this);
-    if (!activeChainId ||
-        !__classPrivateFieldGet(this, _EarnController_supportedPooledStakingChains, "f").includes((0, controller_utils_1.toHex)(activeChainId))) {
-        // Fallback to Ethereum Mainnet if chainId is not supported.
-        return (0, controller_utils_1.convertHexToDecimal)(transaction_controller_1.CHAIN_IDS.MAINNET);
-    }
-    return activeChainId;
 };
 //# sourceMappingURL=EarnController.cjs.map