@exodus/web3-ethereum 7.0.0 → 8.1.0

package/lib/rpc-handlers/createEvmDeps.d.ts

@@ -1,3 +1,3 @@
 import type { CreateEvmDepsFactoryParams, EVMFactory } from '../types.js';
-declare const createEvmDepsFactory: ({ analytics, blockchainMetadata, simulateTransactionConfig, }: CreateEvmDepsFactoryParams) => EVMFactory;
+declare const createEvmDepsFactory: ({ analytics, blockchainMetadata, }: CreateEvmDepsFactoryParams) => EVMFactory;
 export default createEvmDepsFactory;

package/lib/rpc-handlers/createEvmDeps.js

@@ -1,8 +1,7 @@
 import { fetchGasLimit, getNonce as apiGetNonce, getServer, } from '@exodus/ethereum-api';
-import { createSimulationService } from '@exodus/web3-ethereum-utils';
 import BN from 'bn.js';
-const createEvmDepsFactory = ({ analytics, blockchainMetadata, simulateTransactionConfig = {}, }) => {
-    return ({ assetName, origin, getAsset, getAddress: _getAddress, getPrivateKey: _getPrivateKey, getFeeData: getFeeConfig, getActiveWalletAccount, }) => {
+const createEvmDepsFactory = ({ analytics, blockchainMetadata, }) => {
+    return ({ assetName, origin, getAsset, getAddress: _getAddress, getPrivateKey: _getPrivateKey, getFeeData: getFeeConfig, getActiveWalletAccount, simulateTransactions, }) => {
         const asset = getAsset(assetName);
         const server = getServer(asset);
         const forwardRequest = async ({ method, params }) => {
@@ -78,8 +77,6 @@ const createEvmDepsFactory = ({ analytics, blockchainMetadata, simulateTransacti
             });
             return true;
         };
-        const getOrigin = () => origin;
-        const simulationFunctions = createSimulationService(simulateTransactionConfig);
         return {
             chainId: 'undefined',
             forwardRequest,
@@ -90,8 +87,7 @@ const createEvmDepsFactory = ({ analytics, blockchainMetadata, simulateTransacti
             getFeeData,
             getEstimatedGas,
             onEthWalletWatchAssetRequest: trackWalletWatchAssetUse,
-            getOrigin,
-            ...simulationFunctions,
+            simulateTransactions,
         };
     };
 };

package/lib/rpc-handlers/exposeHandlers.js

@@ -1,5 +1,6 @@
 import { AssetNotSupportedError, InvalidInputError, UnauthorizedError, UserRejectedRequestError, } from '@exodus/web3-errors';
 import { getTransactionId, signMessage, signTransaction, signTypedData, } from '@exodus/web3-ethereum-utils';
+import { connect } from '@exodus/web3-rpc-handlers';
 import { hexToBN } from '@exodus/web3-utils';
 import { SignTypedDataVersion } from '@metamask/eth-sig-util';
 import { parseAndValidateTypedData } from './parseAndValidateTypedData.js';
@@ -61,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, simulateTransaction, onTransactionsSigned = () => { }, onEthWalletWatchAssetRequest = () => { }, isUnlocked = () => true, ensureUnlocked = () => true, getAsset, getOrigin, } = deps;
+    const { chainId, isTrusted, isAutoApproved, ensureTrusted, approveConnection, approveMessage, approveTransactions, forwardRequest, getAddress, getPrivateKey, getEstimatedGas, getFeeData, getNonce, sendRawTransaction, simulateTransactions, scanDomains, onTransactionsSigned = () => { }, onEthWalletWatchAssetRequest = () => { }, isUnlocked = () => true, ensureUnlocked = async () => true, getAsset, getOrigin, } = deps;
     const network = `evm:${chainId}`;
     async function assertTrusted() {
         const trusted = await isTrusted();
@@ -123,9 +124,9 @@ export function exposeHandlers(rpc, deps) {
         const preparedTransaction = await prepareTransaction(transaction);
         validateTransaction(preparedTransaction);
         const origin = getOrigin();
-        const simulatedChanges = await simulateTransaction({
+        const simulatedChanges = await simulateTransactions({
             asset,
-            transaction: preparedTransaction,
+            transactions: [preparedTransaction],
             origin,
         });
         await approve(approveTransactions, network, simulatedChanges);
@@ -211,18 +212,14 @@ export function exposeHandlers(rpc, deps) {
             // See: https://docs.metamask.io/guide/rpc-api.html#restricted-methods.
             throw new InvalidInputError();
         }
-        const unlocked = await ensureUnlocked();
-        if (!unlocked) {
-            throw new UserRejectedRequestError();
-        }
-        const trusted = await isTrusted();
-        if (!trusted) {
-            const approved = await approveConnection(network);
-            if (!approved) {
-                throw new UserRejectedRequestError();
-            }
-            await ensureTrusted(network);
-        }
+        await connect({
+            approveConnection,
+            ensureTrusted,
+            isTrusted,
+            ensureUnlocked,
+            getOrigin,
+            scanDomains,
+        }, network);
         return [{ parentCapability: ETH_ACCOUNTS_PERMISSION }];
     });
     exposeEvmFunction('wallet_watchAsset', async (assetDetails) => {

package/lib/rpc-handlers/index.js

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

package/lib/types.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" resolution-mode="require"/>
 import type { EthAggregatedTransactionSimulationResult, EthSimulateTransactionParams, EthTransaction, EthTransactionHash, EthWalletWatchAsset } from '@exodus/web3-ethereum-utils';
 import type { CommonDeps } from '@exodus/web3-rpc-handlers';
-import type { Asset, IAnalyticsModule, IBlockchainMetadataModule, EthereumFeeData, GetFeeDataParams, CreateSimulationServiceParams, ScanDomainsFn } from '@exodus/web3-types';
+import type { Asset, IAnalyticsModule, IBlockchainMetadataModule, EthereumFeeData, GetFeeDataParams, CreateSimulationServiceParams } from '@exodus/web3-types';
 /**
  * EVM-compatible chains.
  */
@@ -19,6 +19,7 @@ export interface CreateEvmDepsFactoryParams {
     blockchainMetadata: IBlockchainMetadataModule;
     simulateTransactionConfig?: CreateSimulationServiceParams;
 }
+declare type SimulateTransactionsFn = (params: EthSimulateTransactionParams) => Promise<EthAggregatedTransactionSimulationResult>;
 export interface CreateEvmDepsParams {
     assetName: string;
     origin: string;
@@ -29,6 +30,7 @@ export interface CreateEvmDepsParams {
     getPrivateKey: (assetName: string) => Promise<{
         privateKey: Buffer;
     }>;
+    simulateTransactions: SimulateTransactionsFn;
 }
 export declare type EVMFactory = (params: CreateEvmDepsParams) => EVMDeps;
 export declare type EVMDeps = {
@@ -36,11 +38,9 @@ export declare type EVMDeps = {
     getAddress: () => Promise<string>;
     getPrivateKey: () => Promise<Buffer>;
     sendRawTransaction: (rawTransaction: string) => Promise<EthTransactionHash>;
-    simulateTransaction: (params: EthSimulateTransactionParams) => Promise<EthAggregatedTransactionSimulationResult>;
-    scanDomains: ScanDomainsFn;
+    simulateTransactions: SimulateTransactionsFn;
     getEstimatedGas: (transaction: EthTransaction) => Promise<string>;
     getFeeData: () => Promise<FeeData>;
-    getOrigin: () => string;
     getNonce: () => Promise<string>;
     forwardRequest: (args: EthRequestArguments) => Promise<unknown>;
     onEthWalletWatchAssetRequest?: (assetDetails: EthWalletWatchAsset) => Promise<boolean>;
@@ -48,3 +48,4 @@ export declare type EVMDeps = {
 export declare type Dependencies = {
     evms: EVMDeps[];
 } & CommonDeps;
+export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@exodus/web3-ethereum",
   "description": "Apps connectivity library for EVM-compatible chains.",
-  "version": "7.0.0",
+  "version": "8.1.0",
   "type": "module",
   "sideEffects": false,
   "module": "lib/index.js",
@@ -33,10 +33,10 @@
     "@exodus/currency": "^2.1.2",
     "@exodus/ethereum-api": "^6.0.0",
     "@exodus/web3-constants": "^1.29.0",
-    "@exodus/web3-ethereum-utils": "^3.0.0",
-    "@exodus/web3-provider": "^2.32.0",
-    "@exodus/web3-rpc-handlers": "^1.7.0",
-    "@exodus/web3-utils": "^1.22.0",
+    "@exodus/web3-ethereum-utils": "^3.2.0",
+    "@exodus/web3-provider": "^2.34.0",
+    "@exodus/web3-rpc-handlers": "^2.1.0",
+    "@exodus/web3-utils": "^1.24.0",
     "bn.js": "^5.2.0",
     "eth-rpc-errors": "^4.0.3"
   },
@@ -44,12 +44,12 @@
     "@exodus/assets": "^8.0.72",
     "@exodus/json-rpc": "^1.11.0",
     "@exodus/schemasafe": "^1.0.0",
-    "@exodus/web3-types": "^1.30.0",
+    "@exodus/web3-types": "^1.32.0",
     "@exodus/web3-validation": "^1.36.0",
     "@wallet-standard/base": "^1.0.1"
   },
   "peerDependencies": {
     "@exodus/assets": "^8.0.72"
   },
-  "gitHead": "5130517c87424b7118b272f053d10fb42750fa3f"
+  "gitHead": "bcd3faa51e2a31d8324d8b107a6bb1327a77fd1d"
 }