@exodus/web3-ethereum 1.4.5 → 1.5.0

package/lib/rpc-handlers/exposeHandlers.js

@@ -2,6 +2,7 @@ import { AssetNotSupportedError, InvalidInputError, UnauthorizedError, UserRejec
 import { getTransactionId, signMessage, signTransaction, signTypedData, } from '@exodus/web3-ethereum-utils';
 import { SignTypedDataVersion } from '@metamask/eth-sig-util';
 import { parseAndValidateTypedData } from './parseAndValidateTypedData.js';
+import { simulateTransaction } from '../simulation/index.js';
 // See: https://eips.ethereum.org/EIPS/eip-2255.
 const ETH_ACCOUNTS_PERMISSION = 'eth_accounts';
 const PROXIED_METHODS = [
@@ -47,7 +48,7 @@ version) {
     return typedData.toString();
 }
 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, } = deps;
+    const { chainId, isTrusted, isAutoApproved, ensureTrusted, approveConnection, approveMessage, approveTransactions, forwardRequest, getAddress, getPrivateKey, getEstimatedGas, getFeeData, getNonce, sendRawTransaction, onTransactionsSigned = () => { }, onEthWalletWatchAssetRequest = () => { }, isUnlocked = () => true, ensureUnlocked = () => true, asset, } = deps;
     const network = `evm:${chainId}`;
     async function assertTrusted() {
         const trusted = await isTrusted();
@@ -107,7 +108,8 @@ export function exposeHandlers(rpc, deps) {
         await assertTrusted();
         const preparedTransaction = await prepareTransaction(transaction);
         validateTransaction(preparedTransaction);
-        await approve(approveTransactions, network, [preparedTransaction]);
+        const simulatedChanges = await simulateTransaction(asset, preparedTransaction);
+        await approve(approveTransactions, network, simulatedChanges);
         const privateKey = await getPrivateKey();
         const signedTransaction = signTransaction({ ...preparedTransaction, chainId }, privateKey);
         const isEIP1559Enabled = !!preparedTransaction.maxFeePerGas;

package/lib/rpc-handlers/validator.js

@@ -144,31 +144,35 @@ export function validateRequest(value) {
             return true
           })()
           const sub10 = (() => {
+            if (!(data[i] === null)) return false
+            return true
+          })()
+          const sub11 = (() => {
             if (!Array.isArray(data[i])) return false
             if (data[i].length < 1) return false
             for (let j = 0; j < data[i].length; j++) {
               if (j in data[i] && hasOwn(data[i], j)) {
-                const sub11 = (() => {
+                const sub12 = (() => {
                   if (!(typeof data[i][j] === 'number')) return false
                   return true
                 })()
-                const sub12 = (() => {
+                const sub13 = (() => {
                   if (!(typeof data[i][j] === 'string')) return false
                   if (data[i][j].length > 100 && stringLength(data[i][j]) > 100)
                     return false
                   if (!format3.test(data[i][j])) return false
                   return true
                 })()
-                if (!(sub11 || sub12)) return false
+                if (!(sub12 || sub13)) return false
               }
             }
             return true
           })()
-          const sub13 = (() => {
+          const sub14 = (() => {
             if (!(Array.isArray(data[i]) && data[i].length === 0)) return false
             return true
           })()
-          if (!(sub2 || sub3 || sub8 || sub9 || sub10 || sub13)) {
+          if (!(sub2 || sub3 || sub8 || sub9 || sub10 || sub11 || sub14)) {
             validate.errors = [
               { keywordLocation: '#/items/anyOf', instanceLocation: '#/' + i },
             ]
@@ -241,17 +245,17 @@ export function validateRequest(value) {
       }
       if ('chainId' in data && hasOwn(data, 'chainId')) {
         let passes1 = 0
-        const sub14 = (() => {
+        const sub15 = (() => {
           if (!(typeof data.chainId === 'string')) return false
           if (!format4.test(data.chainId)) return false
           return true
         })()
-        if (sub14) passes1++
-        const sub15 = (() => {
+        if (sub15) passes1++
+        const sub16 = (() => {
           if (!(typeof data.chainId === 'number')) return false
           return true
         })()
-        if (sub15) passes1++
+        if (sub16) passes1++
         if (passes1 !== 1) {
           validate.errors = [
             {
@@ -385,17 +389,17 @@ export function validateRequest(value) {
         hasOwn(data, 'maxPriorityFeePerGas')
       ) {
         let passes2 = 0
-        const sub16 = (() => {
+        const sub17 = (() => {
           if (!(typeof data.maxPriorityFeePerGas === 'string')) return false
           if (!format1.test(data.maxPriorityFeePerGas)) return false
           return true
         })()
-        if (sub16) passes2++
-        const sub17 = (() => {
+        if (sub17) passes2++
+        const sub18 = (() => {
           if (!(data.maxPriorityFeePerGas === null)) return false
           return true
         })()
-        if (sub17) passes2++
+        if (sub18) passes2++
         if (passes2 !== 1) {
           validate.errors = [
             {
@@ -408,17 +412,17 @@ export function validateRequest(value) {
       }
       if ('maxFeePerGas' in data && hasOwn(data, 'maxFeePerGas')) {
         let passes3 = 0
-        const sub18 = (() => {
+        const sub19 = (() => {
           if (!(typeof data.maxFeePerGas === 'string')) return false
           if (!format1.test(data.maxFeePerGas)) return false
           return true
         })()
-        if (sub18) passes3++
-        const sub19 = (() => {
+        if (sub19) passes3++
+        const sub20 = (() => {
           if (!(data.maxFeePerGas === null)) return false
           return true
         })()
-        if (sub19) passes3++
+        if (sub20) passes3++
         if (passes3 !== 1) {
           validate.errors = [
             {
@@ -1028,13 +1032,13 @@ export function validateRequest(value) {
       }
       if ('image' in data && hasOwn(data, 'image')) {
         let passes4 = 0
-        const sub20 = (() => {
+        const sub21 = (() => {
           if (!(typeof data.image === 'string')) return false
           if (!format6.test(data.image)) return false
           return true
         })()
-        if (sub20) passes4++
-        const sub21 = (() => {
+        if (sub21) passes4++
+        const sub22 = (() => {
           const err38 = validate.errors
           const res38 = ref16(data.image)
           const suberr38 = ref16.errors
@@ -1042,7 +1046,7 @@ export function validateRequest(value) {
           if (!res38) return false
           return true
         })()
-        if (sub21) passes4++
+        if (sub22) passes4++
         if (passes4 !== 1) {
           validate.errors = [
             {

package/lib/simulation/types.d.ts

@@ -1,18 +1,10 @@
+import type { Asset } from '@exodus/web3-types';
+export { Asset };
 export interface CurrencyParams {
     amount: string;
     symbol: string;
     denominator: number;
 }
-export interface Asset {
-    name: string;
-    displayTicker: string;
-    currency: {
-        defaultUnit: {
-            power: number;
-        };
-        baseUnit: (args: unknown) => unknown;
-    };
-}
 export interface EthBalanceChanges {
     willReceive: Array<EthBalanceChange>;
     willSend: Array<EthBalanceChange>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@exodus/web3-ethereum",
   "description": "Apps connectivity library for EVM-compatible chains.",
-  "version": "1.4.5",
+  "version": "1.5.0",
   "type": "module",
   "sideEffects": false,
   "module": "lib/index.js",
@@ -33,22 +33,22 @@
   "dependencies": {
     "@exodus/currency": "^2.1.2",
     "@exodus/ethereum-api": "^3.2.4",
-    "@exodus/web3-constants": "^1.14.0",
+    "@exodus/web3-constants": "^1.15.0",
     "@exodus/web3-ethereum-utils": "^1.8.0",
-    "@exodus/web3-provider": "^2.12.0",
-    "@exodus/web3-rpc-handlers": "^0.7.0",
+    "@exodus/web3-provider": "^2.13.0",
+    "@exodus/web3-rpc-handlers": "^0.8.0",
     "eth-rpc-errors": "^4.0.3"
   },
   "devDependencies": {
     "@exodus/assets": "^8.0.72",
     "@exodus/json-rpc": "^1.11.0",
     "@exodus/schemasafe": "^1.0.0",
-    "@exodus/web3-types": "^1.10.0",
-    "@exodus/web3-validation": "^1.29.1",
+    "@exodus/web3-types": "^1.11.0",
+    "@exodus/web3-validation": "^1.29.2",
     "@wallet-standard/base": "^1.0.1"
   },
   "peerDependencies": {
     "@exodus/assets": "^8.0.72"
   },
-  "gitHead": "e48f74f32e040de9e86ef77ea48058d5c0b36c86"
+  "gitHead": "4a0c077d0175fe3c6a35e2f9a459f8cad214e8f6"
 }