@exodus/web3-ethereum 1.4.0 → 1.4.2

package/lib/provider/provider.js

@@ -29,10 +29,9 @@ export class EthereumProvider extends BaseProvider {
             this.#isConnected = true;
         });
         this.#initializePromise = this.#initialize();
-        this.#getDefaultChainId =
-            typeof getDefaultChainId === 'function'
-                ? getDefaultChainId
-                : async () => null;
+        this.#getDefaultChainId = getDefaultChainId
+            ? getDefaultChainId
+            : async () => null;
     }
     _callRpcMethod(method, params) {
         const prefix = this.#chainId;

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

@@ -4,6 +4,7 @@ import type { Transport } from '@exodus/web3-types';
 interface RpcConstructor {
     new (...options: unknown[]): typeof RPC;
 }
+export declare function parseAndValidateRequestWithEVMPrefix(stringifiedValue: string): any;
 export declare const registerRPCHandlers: ({ deps, RPC, transport, }: {
     deps: Dependencies;
     RPC: RpcConstructor;

package/lib/rpc-handlers/index.js

@@ -24,6 +24,21 @@ function validateEVMsDeps(evms) {
     }
     evms.forEach(validateEVMDeps);
 }
+export function parseAndValidateRequestWithEVMPrefix(stringifiedValue) {
+    const value = JSON.parse(stringifiedValue);
+    const originalMethod = value.method;
+    if (!originalMethod) {
+        return validateRequest(value);
+    }
+    const underscorePosition = originalMethod.indexOf('_');
+    if (underscorePosition === -1) {
+        return validateRequest(value);
+    }
+    // 0x1_eth_getAccounts -> eth_getAccounts
+    const methodWithoutPrefix = originalMethod.slice(underscorePosition + 1);
+    validateRequest({ ...value, method: methodWithoutPrefix });
+    return value;
+}
 export const registerRPCHandlers = ({ deps, RPC, transport, }) => {
     validateCommonDeps(deps, ['evms']);
     validateEVMsDeps(deps.evms);
@@ -33,13 +48,13 @@ export const registerRPCHandlers = ({ deps, RPC, transport, }) => {
     if (!transport) {
         throw new Error('"transport" parameter is required');
     }
+    const { app, evms = [], wallet } = deps;
     const rpc = new RPC({
         transport,
-        parse: validateRequest,
+        parse: parseAndValidateRequestWithEVMPrefix,
         getIsDevelopmentMode: () => app.isDevelopmentEnvironment?.() ?? false,
         requestTimeout: RPC_REQUEST_TIMEOUT,
     });
-    const { app, evms = [], wallet } = deps;
     for (const evm of evms) {
         const evmDeps = { ...app, ...evm, ...wallet };
         exposeHandlers(rpc, evmDeps);

package/lib/rpc-handlers/parseAndValidateTypedData.js

@@ -1,5 +1,5 @@
-import { validateAndParseEthereumTypedData } from '@exodus/web3-validation';
 import { InvalidInputError } from '@exodus/web3-errors';
+import { parseAndValidateTypedData as _parseAndValidateTypedData } from './validator.js';
 export function convertChainIdToHex(chainId) {
     if (typeof chainId !== 'string') {
         throw new Error(`'chainId' should be a string, got: ${typeof chainId}`);
@@ -15,12 +15,12 @@ export function convertChainIdToHex(chainId) {
 export function parseAndValidateTypedData(typedData, { chainId: activeChainId }) {
     let parsedTypedData;
     try {
-        parsedTypedData = validateAndParseEthereumTypedData(typedData);
+        parsedTypedData = _parseAndValidateTypedData(typedData);
     }
     catch (e) {
         throw new InvalidInputError();
     }
-    if (parsedTypedData.domain?.chainId) {
+    if (parsedTypedData?.domain?.chainId) {
         const suppliedChainIdHex = convertChainIdToHex(`${parsedTypedData.domain.chainId}`);
         if (activeChainId.toLowerCase() !== suppliedChainIdHex) {
             throw new InvalidInputError();

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

@@ -1 +1,4 @@
-export declare const validateRequest: () => never;
+declare type UnknownFunction = (...args: unknown[]) => unknown | never;
+export declare const validateRequest: UnknownFunction;
+export declare const parseAndValidateTypedData: UnknownFunction;
+export {};