@exodus/web3-ethereum 3.2.0 → 4.0.0

package/lib/provider/provider.js

@@ -69,9 +69,9 @@ export class EthereumProvider extends BaseProvider {
         this.#handleConnect(chainId);
         this.#handleChainChanged(chainId.toLowerCase());
         const accounts = await this.#getAccounts();
-        this.#handleAccountsChanged(accounts);
         this.#initialized = true;
         this.#initializePromise = null;
+        this.#handleAccountsChanged(accounts);
     };
     #awaitInitialized = async () => {
         if (this.#initializePromise) {

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);

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/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

@@ -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>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@exodus/web3-ethereum",
   "description": "Apps connectivity library for EVM-compatible chains.",
-  "version": "3.2.0",
+  "version": "4.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.21.0",
+    "@exodus/web3-provider": "^2.28.0",
+    "@exodus/web3-rpc-handlers": "^1.3.0",
+    "@exodus/web3-utils": "^1.17.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.26.0",
     "@exodus/web3-validation": "^1.35.0",
     "@wallet-standard/base": "^1.0.1"
   },
   "peerDependencies": {
     "@exodus/assets": "^8.0.72"
   },
-  "gitHead": "8f42c066e1d289271e5db5b859e090d06626ef0f"
+  "gitHead": "e425fafca91cd79471b6fd4fbcd6b78a0a8d4a22"
 }