@exodus/web3-ethereum 3.2.1 → 5.0.0

package/lib/provider/provider.d.ts

@@ -9,7 +9,7 @@ interface EthereumProviderEvents {
 }
 export declare class EthereumProvider extends BaseProvider<EthereumProviderEvents> {
     #private;
-    constructor({ accountsObservable, storage, supportedChainIds, transport, getDefaultChainId, walletProviderManager, }: Deps);
+    constructor({ accountsObservable, storage, supportedChainIds, transport, getDefaultChainId, }: Deps);
     protected _callRpcMethod<Params, Response>(method: string, params: Params): Promise<Response>;
     isConnected(): boolean;
     request: (args: RequestArguments) => Promise<unknown>;

package/lib/provider/provider.js

@@ -5,20 +5,18 @@ export class EthereumProvider extends BaseProvider {
     #storage;
     #supportedChainIds = [];
     #getDefaultChainId;
-    #walletProviderManager;
     #initializePromise = null;
     #initialized = false;
     #isConnected = false;
     #chainId = null;
     #accounts = [];
     #selectedAddress = null;
-    constructor({ accountsObservable, storage, supportedChainIds, transport, getDefaultChainId, walletProviderManager, }) {
+    constructor({ accountsObservable, storage, supportedChainIds, transport, getDefaultChainId, }) {
         if (!supportedChainIds?.length) {
             throw new Error('At least one supported chain must be provided');
         }
         super({ transport });
         this.#storage = createStorageWrapper(storage);
-        this.#walletProviderManager = walletProviderManager;
         this.#supportedChainIds = supportedChainIds
             .map((chainId) => chainId.toLowerCase())
             .sort();
@@ -107,12 +105,7 @@ export class EthereumProvider extends BaseProvider {
     };
     #requestAccounts = async () => {
         const permissions = { eth_accounts: {} };
-        const availableWallets = [];
-        this.#walletProviderManager.getWalletProviders().forEach(({ name }) => {
-            availableWallets.push(name);
-        });
-        const { selectedWallet } = await this._callRpcMethod('wallet_requestPermissions', [permissions, availableWallets]);
-        this.#walletProviderManager.setDefaultWalletProvider(selectedWallet);
+        await this._callRpcMethod('wallet_requestPermissions', [permissions]);
         const accounts = await this._callRpcMethod('eth_accounts', []);
         this.#handleAccountsChanged(accounts);
         if (!(await this.#storage.getChainId())) {

package/lib/provider/types.d.ts

@@ -1,5 +1,5 @@
 import type { Deps as BaseProviderDeps } from '@exodus/web3-provider';
-import type { Observable, Storage, WalletProviderManager } from '@exodus/web3-types';
+import type { Observable, Storage } from '@exodus/web3-types';
 export declare type ChainId = string;
 export interface ProviderConnectInfo {
     chainId: ChainId;
@@ -35,11 +35,10 @@ export declare type Deps = BaseProviderDeps & {
     storage: Storage;
     supportedChainIds: string[];
     getDefaultChainId?: () => Promise<string | null>;
-    walletProviderManager: WalletProviderManager;
 };
 export interface ProviderStorage {
     getChainId: () => Promise<ChainId | null>;
     setChainId: (chainId: ChainId) => Promise<void>;
     clearChainId: () => Promise<void>;
 }
-export { WalletProviderManager };
+export {};

package/lib/rpc-handlers/createEvmDeps.js

@@ -77,6 +77,7 @@ const createEvmDepsFactory = ({ analytics, blockchainMetadata, }) => {
             });
             return true;
         };
+        const getOrigin = () => origin;
         return {
             chainId: 'undefined',
             forwardRequest,
@@ -87,6 +88,7 @@ const createEvmDepsFactory = ({ analytics, blockchainMetadata, }) => {
             getFeeData,
             getEstimatedGas,
             onEthWalletWatchAssetRequest: trackWalletWatchAssetUse,
+            getOrigin,
         };
     };
 };

package/lib/rpc-handlers/exposeHandlers.js

@@ -62,7 +62,7 @@ const isValidGasLimitValue = (value) => {
     return proposedGasLimit.lte(maximumBlockGasLimit);
 };
 export function exposeHandlers(rpc, deps) {
-    const { chainId, isTrusted, isAutoApproved, ensureTrusted, approveConnection, approveMessage, approveTransactions, forwardRequest, getAddress, getPrivateKey, getEstimatedGas, getFeeData, getNonce, sendRawTransaction, onTransactionsSigned = () => { }, onEthWalletWatchAssetRequest = () => { }, isUnlocked = () => true, ensureUnlocked = () => true, getAsset, } = deps;
+    const { chainId, isTrusted, isAutoApproved, ensureTrusted, approveConnection, approveMessage, approveTransactions, forwardRequest, getAddress, getPrivateKey, getEstimatedGas, getFeeData, getNonce, sendRawTransaction, onTransactionsSigned = () => { }, onEthWalletWatchAssetRequest = () => { }, isUnlocked = () => true, ensureUnlocked = () => true, getAsset, getOrigin, } = deps;
     const network = `evm:${chainId}`;
     async function assertTrusted() {
         const trusted = await isTrusted();
@@ -123,7 +123,12 @@ export function exposeHandlers(rpc, deps) {
         const asset = await getAsset(network);
         const preparedTransaction = await prepareTransaction(transaction);
         validateTransaction(preparedTransaction);
-        const simulatedChanges = await simulateTransaction(asset, preparedTransaction);
+        const origin = getOrigin();
+        const simulatedChanges = await simulateTransaction({
+            asset,
+            transaction: preparedTransaction,
+            origin,
+        });
         await approve(approveTransactions, network, simulatedChanges);
         const privateKey = await getPrivateKey();
         const signedTransaction = signTransaction({ ...preparedTransaction, chainId }, privateKey);
@@ -200,9 +205,8 @@ export function exposeHandlers(rpc, deps) {
         }
         return permissions;
     });
-    exposeEvmFunction('wallet_requestPermissions', async (requestedPermissions, availableWallets) => {
+    exposeEvmFunction('wallet_requestPermissions', async (requestedPermissions) => {
         const parentCapability = Object.keys(requestedPermissions)[0];
-        let selectedWallet = null;
         if (parentCapability !== ETH_ACCOUNTS_PERMISSION) {
             // `eth_accounts` is currently the only permission.
             // See: https://docs.metamask.io/guide/rpc-api.html#restricted-methods.
@@ -214,19 +218,13 @@ export function exposeHandlers(rpc, deps) {
         }
         const trusted = await isTrusted();
         if (!trusted) {
-            const response = (await approveConnection(network, availableWallets));
-            if (!response.approved) {
+            const approved = await approveConnection(network);
+            if (!approved) {
                 throw new UserRejectedRequestError();
             }
-            selectedWallet = response.selectedWallet;
-            if (response.selectedWallet === 'exodus') {
-                await ensureTrusted(network);
-            }
+            await ensureTrusted(network);
         }
-        return {
-            walletPermissions: [{ parentCapability: ETH_ACCOUNTS_PERMISSION }],
-            selectedWallet,
-        };
+        return [{ parentCapability: ETH_ACCOUNTS_PERMISSION }];
     });
     exposeEvmFunction('wallet_watchAsset', async (assetDetails) => {
         await assertTrusted();

package/lib/rpc-handlers/index.js

@@ -13,6 +13,7 @@ const validateEVMDeps = (evm) => {
         'getFeeData',
         'getNonce',
         'sendRawTransaction',
+        'getOrigin',
     ];
     const optionalKeys = ['onEthWalletWatchAssetRequest'];
     validateDeps(evm, requiredKeys, optionalKeys);

package/lib/rpc-handlers/validator.js

@@ -913,12 +913,6 @@ export function validateRequest(value) {
         validate.errors = [{ keywordLocation: '#/type', instanceLocation: '#' }]
         return false
       }
-      if (data.length > 2) {
-        validate.errors = [
-          { keywordLocation: '#/maxItems', instanceLocation: '#' },
-        ]
-        return false
-      }
       if (data.length < 1) {
         validate.errors = [
           { keywordLocation: '#/minItems', instanceLocation: '#' },
@@ -935,46 +929,7 @@ export function validateRequest(value) {
           return false
         }
       }
-      if (1 in data && hasOwn(data, 1)) {
-        if (!Array.isArray(data[1])) {
-          validate.errors = [
-            { keywordLocation: '#/1/type', instanceLocation: '#/1' },
-          ]
-          return false
-        }
-        for (let l = 0; l < data[1].length; l++) {
-          if (l in data[1] && hasOwn(data[1], l)) {
-            if (!(typeof data[1][l] === 'string')) {
-              validate.errors = [
-                {
-                  keywordLocation: '#/1/items/type',
-                  instanceLocation: '#/1/' + l,
-                },
-              ]
-              return false
-            }
-            if (data[1][l].length > 20 && stringLength(data[1][l]) > 20) {
-              validate.errors = [
-                {
-                  keywordLocation: '#/1/items/maxLength',
-                  instanceLocation: '#/1/' + l,
-                },
-              ]
-              return false
-            }
-            if (!format3.test(data[1][l])) {
-              validate.errors = [
-                {
-                  keywordLocation: '#/1/items/format',
-                  instanceLocation: '#/1/' + l,
-                },
-              ]
-              return false
-            }
-          }
-        }
-      }
-      if (data.length > 2) {
+      if (data.length > 1) {
         validate.errors = [
           { keywordLocation: '#/items', instanceLocation: '#' },
         ]

package/lib/simulation/simulation.d.ts

@@ -1,10 +1,9 @@
-import type { EthBalanceChanges } from './types.js';
-import type { EthTransaction } from '@exodus/web3-ethereum-utils';
-import type { Asset, NumberUnit } from '@exodus/web3-types';
-export declare const simulateTransaction: (asset: Asset, transaction: EthTransaction) => Promise<{
+import type { EthSimulateTransactionParams } from '@exodus/web3-ethereum-utils';
+import type { NumberUnit } from '@exodus/web3-types';
+export declare const simulateTransaction: ({ asset, transaction, origin, }: EthSimulateTransactionParams) => Promise<{
     baseAssetName: string;
     advancedDetails: never[];
-    balanceChanges: EthBalanceChanges;
+    balanceChanges: import("@exodus/web3-types").BalanceChanges;
     displayInfo: {
         title: string;
     };

package/lib/simulation/simulation.js

@@ -1,35 +1,7 @@
-import { retrieveSideEffects } from '@exodus/ethereum-api';
+import { createSimulateTransaction } from '@exodus/web3-ethereum-utils';
 import { SIMULATION_SUPPORTED_ASSET_NAMES } from './constant.js';
-import { formatAccounts, getEthereumDisplayInfo, hexToBN, isEthTransferTx, } from './utils.js';
-const computeBalanceChanges = async (asset, shouldSimulate, transaction) => {
-    let balanceChanges = {
-        willReceive: [],
-        willSend: [],
-        willApprove: [],
-    };
-    if (isEthTransferTx(transaction)) {
-        const txValue = hexToBN(transaction.value).toString();
-        balanceChanges.willSend.push({
-            balance: asset.currency.baseUnit(txValue),
-        });
-    }
-    else {
-        try {
-            const sideEffect = await retrieveSideEffects({
-                asset,
-                shouldSimulate,
-                transaction,
-            });
-            if (sideEffect) {
-                balanceChanges = formatAccounts(sideEffect);
-            }
-        }
-        catch (error) {
-            console.error('Ethereum transaction simulation failed.', error);
-        }
-    }
-    return balanceChanges;
-};
+import { getEthereumDisplayInfo, hexToBN } from './utils.js';
+const simulateTransactionV2 = createSimulateTransaction();
 const getTxFeeDetails = (asset, transaction) => {
     const maxFeePerGasBn = transaction.maxFeePerGas
         ? hexToBN(transaction.maxFeePerGas)
@@ -45,10 +17,15 @@ const getTxFeeDetails = (asset, transaction) => {
         },
     };
 };
-export const simulateTransaction = async (asset, transaction) => {
+export const simulateTransaction = async ({ asset, transaction, origin, }) => {
     const baseAssetName = asset.name;
     const shouldSimulate = SIMULATION_SUPPORTED_ASSET_NAMES.includes(baseAssetName);
-    const balanceChanges = await computeBalanceChanges(asset, shouldSimulate, transaction);
+    const { balanceChanges } = await simulateTransactionV2({
+        transaction,
+        asset,
+        origin,
+        shouldCallPreviewApi: shouldSimulate,
+    });
     const { txFee, txFeeDetails } = getTxFeeDetails(asset, transaction);
     const displayInfo = getEthereumDisplayInfo(balanceChanges);
     return {

package/lib/types.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" resolution-mode="require"/>
 import type { EthTransaction, EthTransactionHash, EthWalletWatchAsset } from '@exodus/web3-ethereum-utils';
 import type { CommonDeps } from '@exodus/web3-rpc-handlers';
-import type { Asset, IAnalyticsModule, IBlockchainMetadataModule, ApproveConnectionResponse, EthereumFeeData, GetFeeDataParams } from '@exodus/web3-types';
+import type { Asset, IAnalyticsModule, IBlockchainMetadataModule, EthereumFeeData, GetFeeDataParams } from '@exodus/web3-types';
 /**
  * EVM-compatible chains.
  */
@@ -37,6 +37,7 @@ export declare type EVMDeps = {
     sendRawTransaction: (rawTransaction: string) => Promise<EthTransactionHash>;
     getEstimatedGas: (transaction: EthTransaction) => Promise<string>;
     getFeeData: () => Promise<FeeData>;
+    getOrigin: () => string;
     getNonce: () => Promise<string>;
     forwardRequest: (args: EthRequestArguments) => Promise<unknown>;
     onEthWalletWatchAssetRequest?: (assetDetails: EthWalletWatchAsset) => Promise<boolean>;
@@ -44,4 +45,3 @@ export declare type EVMDeps = {
 export declare type Dependencies = {
     evms: EVMDeps[];
 } & CommonDeps;
-export { ApproveConnectionResponse };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@exodus/web3-ethereum",
   "description": "Apps connectivity library for EVM-compatible chains.",
-  "version": "3.2.1",
+  "version": "5.0.0",
   "type": "module",
   "sideEffects": false,
   "module": "lib/index.js",
@@ -34,10 +34,10 @@
     "@exodus/currency": "^2.1.2",
     "@exodus/ethereum-api": "^6.0.0",
     "@exodus/web3-constants": "^1.29.0",
-    "@exodus/web3-ethereum-utils": "^1.20.0",
-    "@exodus/web3-provider": "^2.27.0",
-    "@exodus/web3-rpc-handlers": "^1.2.0",
-    "@exodus/web3-utils": "^1.16.0",
+    "@exodus/web3-ethereum-utils": "^1.22.0",
+    "@exodus/web3-provider": "^2.29.0",
+    "@exodus/web3-rpc-handlers": "^1.4.0",
+    "@exodus/web3-utils": "^1.18.0",
     "bn.js": "^5.2.0",
     "eth-rpc-errors": "^4.0.3"
   },
@@ -45,12 +45,12 @@
     "@exodus/assets": "^8.0.72",
     "@exodus/json-rpc": "^1.11.0",
     "@exodus/schemasafe": "^1.0.0",
-    "@exodus/web3-types": "^1.25.0",
+    "@exodus/web3-types": "^1.27.0",
     "@exodus/web3-validation": "^1.35.0",
     "@wallet-standard/base": "^1.0.1"
   },
   "peerDependencies": {
     "@exodus/assets": "^8.0.72"
   },
-  "gitHead": "0a1ef133949a68de8df6ab3320d75319f10eadaa"
+  "gitHead": "ce1e0287af1a5ee3d1f90b71dda277ca6f785825"
 }