@exodus/web3-ethereum 11.14.0 → 12.0.1

package/lib/rpc-handlers/{createEvmDeps.d.ts → createEVMDeps.d.ts}

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

package/lib/rpc-handlers/{createEvmDeps.js → createEVMDeps.js}

@@ -8,8 +8,8 @@ async function getDefaultPurposeForLedger(asset) {
     });
     return purposes[0];
 }
-const createEvmDepsFactory = ({ analytics, blockchainMetadata, }) => {
-    return ({ assetName, origin, getAsset, getAddress: _getAddress, getPrivateKey: _getPrivateKey, getFeeData: getFeeConfig, getCustomFeeRate, getActiveWalletAccount, simulateEthereumTransactions, getActiveWalletAccountData, transactionSigner, getLedgerDevice, }) => {
+const createEVMDepsFactory = ({ analytics, blockchainMetadata, }) => {
+    return ({ assetName, origin, getAsset, getAddress: _getAddress, getPrivateKey, getFeeData: getFeeConfig, getCustomFeeRate, getActiveWalletAccount, simulateEthereumTransactions, getActiveWalletAccountData, transactionSigner, getLedgerDevice, }) => {
         const asset = getAsset(assetName);
         const server = getServer(asset);
         const forwardRequest = async ({ method, params }) => {
@@ -25,10 +25,6 @@ const createEvmDepsFactory = ({ analytics, blockchainMetadata, }) => {
         const getAddress = async () => {
             return _getAddress(assetName);
         };
-        const getPrivateKey = async () => {
-            const { privateKey } = await _getPrivateKey(assetName);
-            return privateKey;
-        };
         const getNonce = async () => {
             const [baseAssetTxLog, blockchainNonce] = await Promise.all([
                 blockchainMetadata.getTxLog({
@@ -113,7 +109,10 @@ const createEvmDepsFactory = ({ analytics, blockchainMetadata, }) => {
                     throw new InvalidInputError("Can't set both rawMessage and EIP712Message");
                 }
                 if (walletAccount.source === 'exodus') {
-                    const privateKey = await getPrivateKey();
+                    if (!getPrivateKey) {
+                        throw new Error('`getPrivateKey` should be provided to sign with Exodus accounts.');
+                    }
+                    const { privateKey } = await getPrivateKey(assetName);
                     if (rawMessage) {
                         return hex0xStringToBuffer(signMessage(bufferToHex0xString(rawMessage), privateKey));
                     }
@@ -152,7 +151,6 @@ const createEvmDepsFactory = ({ analytics, blockchainMetadata, }) => {
             forwardRequest,
             sendRawTransaction,
             getAddress,
-            getPrivateKey,
             getNonce,
             getFeeData,
             getEstimatedGas,
@@ -165,4 +163,4 @@ const createEvmDepsFactory = ({ analytics, blockchainMetadata, }) => {
         };
     };
 };
-export default createEvmDepsFactory;
+export default createEVMDepsFactory;

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

@@ -1,4 +1,4 @@
-export { default as createEvmDepsFactory } from './createEvmDeps.js';
+export { default as createEVMDepsFactory } from './createEVMDeps.js';
 import type { Dependencies, EthRequestArguments } from '../types.js';
 import type { RPC, Transport } from '@exodus/web3-types';
 export declare function validateRequestWithEVMPrefix(request: EthRequestArguments): unknown;

package/lib/rpc-handlers/index.js

@@ -2,13 +2,12 @@ import { RPC_REQUEST_TIMEOUT } from '@exodus/web3-constants';
 import { validate as validateDeps, validateCommonDeps, } from '@exodus/web3-rpc-handlers';
 import { exposeHandlers } from './exposeHandlers.js';
 import { validateRequest } from './validator.js';
-export { default as createEvmDepsFactory } from './createEvmDeps.js';
+export { default as createEVMDepsFactory } from './createEVMDeps.js';
 const validateEVMDeps = (evm) => {
     const requiredKeys = [
         'chainId',
         'forwardRequest',
         'getAddress',
-        'getPrivateKey',
         'getEstimatedGas',
         'getFeeData',
         'getCustomFeeData',

package/lib/rpc-handlers/validator.js

@@ -1060,12 +1060,24 @@ export function validateRequest(value) {
           return false
         }
       }
+      if ('chainId' in data && hasOwn(data, 'chainId')) {
+        if (!(typeof data.chainId === 'number')) {
+          validate.errors = [
+            {
+              keywordLocation: '#/properties/chainId/type',
+              instanceLocation: '#/chainId',
+            },
+          ]
+          return false
+        }
+      }
       for (const key6 of Object.keys(data)) {
         if (
           key6 !== 'address' &&
           key6 !== 'symbol' &&
           key6 !== 'decimals' &&
-          key6 !== 'image'
+          key6 !== 'image' &&
+          key6 !== 'chainId'
         ) {
           validate.errors = [
             {

package/lib/types.d.ts

@@ -33,7 +33,7 @@ export interface CreateEvmDepsParams {
     getAsset: (assetName: string) => Asset;
     getFeeData: ({ assetName }: GetFeeDataParams) => Promise<EthereumFeeData>;
     getCustomFeeRate?: () => Promise<NumberUnit>;
-    getPrivateKey: (assetName: string) => Promise<{
+    getPrivateKey?: (assetName: string) => Promise<{
         privateKey: Buffer;
     }>;
     simulateEthereumTransactions: SimulateTransactionsFn;
@@ -46,7 +46,6 @@ export declare type EVMTransactionSignerModule = ITransactionSignerModule<EVMUns
 export declare type EVMDeps = {
     chainId: string;
     getAddress: () => Promise<string>;
-    getPrivateKey: () => Promise<Buffer>;
     sendRawTransaction: (rawTransaction: string) => Promise<EthTransactionHash>;
     simulateEthereumTransactions: SimulateTransactionsFn;
     getEstimatedGas: (transaction: EthTransaction) => Promise<string>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@exodus/web3-ethereum",
   "description": "Apps connectivity library for EVM-compatible chains.",
-  "version": "11.14.0",
+  "version": "12.0.1",
   "type": "module",
   "sideEffects": false,
   "module": "lib/index.js",
@@ -35,7 +35,7 @@
     "@exodus/currency": "^2.1.2",
     "@exodus/ethereum-api": "^6.3.33",
     "@exodus/web3-constants": "^1.30.0",
-    "@exodus/web3-ethereum-utils": "^3.24.0",
+    "@exodus/web3-ethereum-utils": "^3.25.0",
     "@exodus/web3-provider": "^3.14.0",
     "@exodus/web3-rpc-handlers": "^2.20.0",
     "@exodus/web3-utils": "^1.43.0",
@@ -51,8 +51,5 @@
     "@exodus/web3-validation": "^1.38.0",
     "@wallet-standard/base": "^1.0.1"
   },
-  "peerDependencies": {
-    "@exodus/assets": "^8.0.95"
-  },
-  "gitHead": "2907aa869e958d805f8652dec0b577fc84235632"
+  "gitHead": "1806ac87e07db41fd3f711418bc3ba75bb88bf8a"
 }