fix: contract eth_call bug and made some improvements

packages/prover/package.json

@@ -15,8 +15,10 @@
   "type": "module",
   "exports": {
     ".": {
-      "import": "./lib/index.js",
-      "browser": "./lib/index.web.js"
+      "import": "./lib/index.js"
+    },
+    "./browser": {
+      "import": "./lib/browser/index.js"
     }
   },
   "bin": {

packages/prover/src/browser/index.ts

@@ -0,0 +1,3 @@
+export * from "../interfaces.js";
+export * from "../proof_provider/index.js";
+export {createVerifiedExecutionProvider} from "../web3_provider.js";

packages/prover/src/constants.ts

@@ -1,6 +1,6 @@
 // https://github.com/ethereum/consensus-specs/blob/dev/specs/altair/light-client/p2p-interface.md#configuration
 export const MAX_REQUEST_LIGHT_CLIENT_UPDATES = 128;
 export const MAX_PAYLOAD_HISTORY = 32;
-export const UNVERIFIED_RESPONSE_CODE = -33091;
+export const VERIFICATION_FAILED_RESPONSE_CODE = -33091;
 export const ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
 export const DEFAULT_PROXY_REQUEST_TIMEOUT = 3000;

packages/prover/src/index.ts

@@ -1,3 +1,5 @@
 export * from "./interfaces.js";
+export * from "./proof_provider/index.js";
 export {createVerifiedExecutionProvider} from "./web3_provider.js";
 export {createVerifiedExecutionProxy} from "./web3_proxy.js";
+export {isVerificationFailedError} from "./utils/json_rpc.js";

packages/prover/src/interfaces.ts

@@ -5,6 +5,7 @@ import {ProofProvider} from "./proof_provider/proof_provider.js";
 import {JsonRpcRequest, JsonRpcRequestOrBatch, JsonRpcResponse, JsonRpcResponseOrBatch} from "./types.js";
 import {ELRpc} from "./utils/rpc.js";
 
+export {NetworkName} from "@lodestar/config/networks";
 export enum LCTransport {
   Rest = "Rest",
   P2P = "P2P",

packages/prover/src/proof_provider/index.ts

@@ -0,0 +1 @@
+export * from "./proof_provider.js";

packages/prover/src/utils/evm.ts

@@ -84,8 +84,19 @@ export async function getVMWithState({
 
   const batchRequests = [];
   for (const [address, storageKeys] of Object.entries(storageKeysMap)) {
-    batchRequests.push({jsonrpc: "2.0", method: "eth_getProof", params: [address, storageKeys, blockHashHex]});
-    batchRequests.push({jsonrpc: "2.0", method: "eth_getCode", params: [address, blockHashHex]});
+    batchRequests.push({
+      jsonrpc: "2.0",
+      id: rpc.getRequestId(),
+      method: "eth_getProof",
+      params: [address, storageKeys, blockHashHex],
+    });
+
+    batchRequests.push({
+      jsonrpc: "2.0",
+      id: rpc.getRequestId(),
+      method: "eth_getCode",
+      params: [address, blockHashHex],
+    });
   }
 
   // If all responses are valid then we will have even number of responses

packages/prover/src/utils/json_rpc.ts

@@ -1,5 +1,5 @@
 import {Logger} from "@lodestar/logger";
-import {UNVERIFIED_RESPONSE_CODE} from "../constants.js";
+import {VERIFICATION_FAILED_RESPONSE_CODE} from "../constants.js";
 import {
   JsonRpcErrorPayload,
   JsonRpcNotificationPayload,
@@ -44,18 +44,26 @@ export function getResponseForRequest<P, R, E = unknown>(
   throw new Error("Either result or error must be defined.");
 }
 
-export function getErrorResponseForUnverifiedRequest<P, D = unknown>(
+export function getVerificationFailedMessage(method: string): string {
+  return `verification for '${method}' request failed.`;
+}
+
+export function isVerificationFailedError<P>(payload: JsonRpcResponseWithErrorPayload<P>): boolean {
+  return !isValidResponsePayload(payload) && payload.error.code === VERIFICATION_FAILED_RESPONSE_CODE;
+}
+
+export function getErrorResponseForRequestWithFailedVerification<P, D = unknown>(
   payload: JsonRpcRequest<P>,
   message: string,
   data?: D
 ): JsonRpcResponseWithErrorPayload<D> {
   return isNullish(data)
     ? (getResponseForRequest(payload, undefined, {
-        code: UNVERIFIED_RESPONSE_CODE,
+        code: VERIFICATION_FAILED_RESPONSE_CODE,
         message,
       }) as JsonRpcResponseWithErrorPayload<D>)
     : (getResponseForRequest(payload, undefined, {
-        code: UNVERIFIED_RESPONSE_CODE,
+        code: VERIFICATION_FAILED_RESPONSE_CODE,
         message,
         data,
       }) as JsonRpcResponseWithErrorPayload<D>);

packages/prover/src/utils/rpc.ts

@@ -98,7 +98,7 @@ export class ELRpc {
     }
   }
 
-  private getRequestId(): string {
+  getRequestId(): string {
     // TODO: Find better way to generate random id
     return (Math.random() * 10000).toFixed(0);
   }

packages/prover/src/verified_requests/eth_call.ts

@@ -2,7 +2,11 @@ import {ELVerifiedRequestHandler} from "../interfaces.js";
 import {ELApiParams, ELApiReturn} from "../types.js";
 import {bufferToHex} from "../utils/conversion.js";
 import {createVM, executeVMCall, getVMWithState} from "../utils/evm.js";
-import {getResponseForRequest, getErrorResponseForUnverifiedRequest} from "../utils/json_rpc.js";
+import {
+  getResponseForRequest,
+  getErrorResponseForRequestWithFailedVerification,
+  getVerificationFailedMessage,
+} from "../utils/json_rpc.js";
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export const eth_call: ELVerifiedRequestHandler<ELApiParams["eth_call"], ELApiReturn["eth_call"]> = async ({
@@ -42,6 +46,6 @@ export const eth_call: ELVerifiedRequestHandler<ELApiParams["eth_call"], ELApiRe
       {method: payload.method, params: JSON.stringify(payload.params)},
       err as Error
     );
-    return getErrorResponseForUnverifiedRequest(payload, "eth_call request can not be verified.");
+    return getErrorResponseForRequestWithFailedVerification(payload, getVerificationFailedMessage("eth_call"));
   }
 };

packages/prover/src/verified_requests/eth_estimateGas.ts

@@ -2,7 +2,11 @@ import {ELVerifiedRequestHandler} from "../interfaces.js";
 import {ELApiParams, ELApiReturn} from "../types.js";
 import {bigIntToHex} from "../utils/conversion.js";
 import {createVM, executeVMTx, getVMWithState} from "../utils/evm.js";
-import {getErrorResponseForUnverifiedRequest, getResponseForRequest} from "../utils/json_rpc.js";
+import {
+  getErrorResponseForRequestWithFailedVerification,
+  getResponseForRequest,
+  getVerificationFailedMessage,
+} from "../utils/json_rpc.js";
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export const eth_estimateGas: ELVerifiedRequestHandler<
@@ -41,6 +45,6 @@ export const eth_estimateGas: ELVerifiedRequestHandler<
       {method: payload.method, params: JSON.stringify(payload.params)},
       err as Error
     );
-    return getErrorResponseForUnverifiedRequest(payload, "eth_estimateGas request can not be verified.");
+    return getErrorResponseForRequestWithFailedVerification(payload, getVerificationFailedMessage("eth_estimateGas"));
   }
 };

packages/prover/src/verified_requests/eth_getBalance.ts

@@ -1,6 +1,10 @@
 import {ELVerifiedRequestHandler} from "../interfaces.js";
 import {verifyAccount} from "../utils/verification.js";
-import {getErrorResponseForUnverifiedRequest, getResponseForRequest} from "../utils/json_rpc.js";
+import {
+  getErrorResponseForRequestWithFailedVerification,
+  getResponseForRequest,
+  getVerificationFailedMessage,
+} from "../utils/json_rpc.js";
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export const eth_getBalance: ELVerifiedRequestHandler<[address: string, block?: number | string], string> = async ({
@@ -19,5 +23,5 @@ export const eth_getBalance: ELVerifiedRequestHandler<[address: string, block?:
   }
 
   logger.error("Request could not be verified.", {method: payload.method, params: JSON.stringify(payload.params)});
-  return getErrorResponseForUnverifiedRequest(payload, "eth_getBalance request can not be verified.");
+  return getErrorResponseForRequestWithFailedVerification(payload, getVerificationFailedMessage("eth_getBalance"));
 };

packages/prover/src/verified_requests/eth_getBlockByHash.ts

@@ -1,7 +1,11 @@
 import {ELVerifiedRequestHandler} from "../interfaces.js";
 import {ELBlock} from "../types.js";
 import {verifyBlock} from "../utils/verification.js";
-import {getErrorResponseForUnverifiedRequest, getResponseForRequest} from "../utils/json_rpc.js";
+import {
+  getErrorResponseForRequestWithFailedVerification,
+  getResponseForRequest,
+  getVerificationFailedMessage,
+} from "../utils/json_rpc.js";
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export const eth_getBlockByHash: ELVerifiedRequestHandler<[block: string, hydrated: boolean], ELBlock> = async ({
@@ -17,5 +21,5 @@ export const eth_getBlockByHash: ELVerifiedRequestHandler<[block: string, hydrat
   }
 
   logger.error("Request could not be verified.", {method: payload.method, params: JSON.stringify(payload.params)});
-  return getErrorResponseForUnverifiedRequest(payload, "eth_getBlockByHash request can not be verified.");
+  return getErrorResponseForRequestWithFailedVerification(payload, getVerificationFailedMessage("eth_getBlockByHash"));
 };

packages/prover/src/verified_requests/eth_getBlockByNumber.ts

@@ -1,7 +1,11 @@
 import {ELVerifiedRequestHandler} from "../interfaces.js";
 import {ELBlock} from "../types.js";
 import {verifyBlock} from "../utils/verification.js";
-import {getErrorResponseForUnverifiedRequest, getResponseForRequest} from "../utils/json_rpc.js";
+import {
+  getErrorResponseForRequestWithFailedVerification,
+  getResponseForRequest,
+  getVerificationFailedMessage,
+} from "../utils/json_rpc.js";
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export const eth_getBlockByNumber: ELVerifiedRequestHandler<
@@ -15,5 +19,8 @@ export const eth_getBlockByNumber: ELVerifiedRequestHandler<
   }
 
   logger.error("Request could not be verified.", {method: payload.method, params: JSON.stringify(payload.params)});
-  return getErrorResponseForUnverifiedRequest(payload, "eth_getBlockByNumber request can not be verified.");
+  return getErrorResponseForRequestWithFailedVerification(
+    payload,
+    getVerificationFailedMessage("eth_getBlockByNumber")
+  );
 };

packages/prover/src/verified_requests/eth_getCode.ts

@@ -1,6 +1,10 @@
 import {ELVerifiedRequestHandler} from "../interfaces.js";
 import {verifyAccount, verifyCode} from "../utils/verification.js";
-import {getErrorResponseForUnverifiedRequest, getResponseForRequest} from "../utils/json_rpc.js";
+import {
+  getErrorResponseForRequestWithFailedVerification,
+  getResponseForRequest,
+  getVerificationFailedMessage,
+} from "../utils/json_rpc.js";
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export const eth_getCode: ELVerifiedRequestHandler<[address: string, block?: number | string], string> = async ({
@@ -23,7 +27,10 @@ export const eth_getCode: ELVerifiedRequestHandler<[address: string, block?: num
 
   if (!accountProof.valid) {
     logger.error("Request could not be verified.", {method: payload.method, params: JSON.stringify(payload.params)});
-    return getErrorResponseForUnverifiedRequest(payload, "account for eth_getCode request can not be verified.");
+    return getErrorResponseForRequestWithFailedVerification(
+      payload,
+      "account for eth_getCode request can not be verified."
+    );
   }
 
   const codeProof = await verifyCode({
@@ -40,5 +47,5 @@ export const eth_getCode: ELVerifiedRequestHandler<[address: string, block?: num
   }
 
   logger.error("Request could not be verified.", {method: payload.method, params: JSON.stringify(payload.params)});
-  return getErrorResponseForUnverifiedRequest(payload, "eth_getCode request can not be verified.");
+  return getErrorResponseForRequestWithFailedVerification(payload, getVerificationFailedMessage("eth_getCode"));
 };

packages/prover/src/verified_requests/eth_getTransactionCount.ts

@@ -1,6 +1,10 @@
 import {ELVerifiedRequestHandler} from "../interfaces.js";
 import {verifyAccount} from "../utils/verification.js";
-import {getResponseForRequest, getErrorResponseForUnverifiedRequest} from "../utils/json_rpc.js";
+import {
+  getResponseForRequest,
+  getErrorResponseForRequestWithFailedVerification,
+  getVerificationFailedMessage,
+} from "../utils/json_rpc.js";
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export const eth_getTransactionCount: ELVerifiedRequestHandler<
@@ -17,5 +21,8 @@ export const eth_getTransactionCount: ELVerifiedRequestHandler<
   }
 
   logger.error("Request could not be verified.", {method: payload.method, params: JSON.stringify(payload.params)});
-  return getErrorResponseForUnverifiedRequest(payload, "eth_getTransactionCount request can not be verified.");
+  return getErrorResponseForRequestWithFailedVerification(
+    payload,
+    getVerificationFailedMessage("eth_getTransactionCount")
+  );
 };

packages/prover/src/web3_proxy.ts

@@ -1,4 +1,5 @@
 import http from "node:http";
+import https from "node:https";
 import url from "node:url";
 import httpProxy from "http-proxy";
 import {getNodeLogger} from "@lodestar/logger/node";
@@ -78,7 +79,7 @@ export function createVerifiedExecutionProxy(opts: VerifiedProxyOptions): {
   const proxy = httpProxy.createProxy({
     target: executionRpcUrl,
     ws: executionRpcUrl.startsWith("ws"),
-    agent: http.globalAgent,
+    agent: executionRpcUrl.startsWith("https") ? https.globalAgent : http.globalAgent,
     xfwd: true,
     ignorePath: true,
     changeOrigin: true,

packages/prover/test/e2e/web3_batch_request.test.ts

@@ -4,6 +4,7 @@ import Web3 from "web3";
 import {LCTransport} from "../../src/interfaces.js";
 import {createVerifiedExecutionProvider} from "../../src/web3_provider.js";
 import {rpcUrl, beaconUrl, config} from "../utils/e2e_env.js";
+import {getVerificationFailedMessage} from "../../src/utils/json_rpc.js";
 
 describe("web3_batch_requests", function () {
   // Give some margin to sync light client
@@ -94,7 +95,7 @@ describe("web3_batch_requests", function () {
       batch.execute();
 
       await expect(successRequest).to.be.fulfilled;
-      await expect(errorRequest).to.be.rejectedWith("eth_getBlockByHash request can not be verified");
+      await expect(errorRequest).to.be.rejectedWith(getVerificationFailedMessage("eth_getBlockByHash"));
     });
   });
 });

packages/prover/test/mocks/request_handler.ts

@@ -117,6 +117,7 @@ export function generateReqHandlerOptionsMock(
     rpc: {
       request: sinon.stub(),
       batchRequest: sinon.stub(),
+      getRequestId: () => (Math.random() * 10000).toFixed(0),
     },
   };
 

packages/prover/test/unit/verified_requests/eth_call.test.ts

@@ -3,11 +3,12 @@ import deepmerge from "deepmerge";
 import {createForkConfig} from "@lodestar/config";
 import {NetworkName, networksChainConfig} from "@lodestar/config/networks";
 import {ELTransaction} from "../../../lib/types.js";
-import {UNVERIFIED_RESPONSE_CODE} from "../../../src/constants.js";
+import {VERIFICATION_FAILED_RESPONSE_CODE} from "../../../src/constants.js";
 import {eth_call} from "../../../src/verified_requests/eth_call.js";
 import ethCallCase1 from "../../fixtures/mainnet/eth_call.json" assert {type: "json"};
 import {generateReqHandlerOptionsMock} from "../../mocks/request_handler.js";
 import {JsonRpcRequest, JsonRpcResponseWithResultPayload} from "../../../src/types.js";
+import {getVerificationFailedMessage} from "../../../src/utils/json_rpc.js";
 
 const testCases = [ethCallCase1];
 
@@ -60,7 +61,7 @@ describe("verified_requests / eth_call", () => {
         expect(response).to.eql({
           jsonrpc: "2.0",
           id: testCase.request.id,
-          error: {code: UNVERIFIED_RESPONSE_CODE, message: "eth_call request can not be verified."},
+          error: {code: VERIFICATION_FAILED_RESPONSE_CODE, message: getVerificationFailedMessage("eth_call")},
         });
       });
     });

packages/prover/test/unit/verified_requests/eth_estimateGas.test.ts

@@ -3,12 +3,13 @@ import deepmerge from "deepmerge";
 import {createForkConfig} from "@lodestar/config";
 import {NetworkName, networksChainConfig} from "@lodestar/config/networks";
 import {ELTransaction} from "../../../lib/types.js";
-import {UNVERIFIED_RESPONSE_CODE} from "../../../src/constants.js";
+import {VERIFICATION_FAILED_RESPONSE_CODE} from "../../../src/constants.js";
 import {eth_estimateGas} from "../../../src/verified_requests/eth_estimateGas.js";
 import ethEstimateGasCase1 from "../../fixtures/mainnet/eth_estimateGas_simple_transfer.json" assert {type: "json"};
 import ethEstimateGasCase2 from "../../fixtures/mainnet/eth_estimateGas_contract_call.json" assert {type: "json"};
 import {TestFixture, generateReqHandlerOptionsMock} from "../../mocks/request_handler.js";
 import {JsonRpcRequest, JsonRpcResponseWithResultPayload} from "../../../src/types.js";
+import {getVerificationFailedMessage} from "../../../src/utils/json_rpc.js";
 
 const testCases = [ethEstimateGasCase1, ethEstimateGasCase2] as TestFixture[];
 
@@ -62,7 +63,7 @@ describe("verified_requests / eth_estimateGas", () => {
         expect(response).to.eql({
           jsonrpc: "2.0",
           id: testCase.request.id,
-          error: {code: UNVERIFIED_RESPONSE_CODE, message: "eth_estimateGas request can not be verified."},
+          error: {code: VERIFICATION_FAILED_RESPONSE_CODE, message: getVerificationFailedMessage("eth_estimateGas")},
         });
       });
     });

packages/prover/test/unit/verified_requests/eth_getBalance.test.ts

@@ -2,11 +2,12 @@ import {expect} from "chai";
 import deepmerge from "deepmerge";
 import {createForkConfig} from "@lodestar/config";
 import {NetworkName, networksChainConfig} from "@lodestar/config/networks";
-import {UNVERIFIED_RESPONSE_CODE} from "../../../src/constants.js";
+import {VERIFICATION_FAILED_RESPONSE_CODE} from "../../../src/constants.js";
 import {eth_getBalance} from "../../../src/verified_requests/eth_getBalance.js";
 import eth_getBalance_eoa from "../../fixtures/sepolia/eth_getBalance_eoa.json" assert {type: "json"};
 import eth_getBalance_contract from "../../fixtures/sepolia/eth_getBalance_contract.json" assert {type: "json"};
 import {generateReqHandlerOptionsMock} from "../../mocks/request_handler.js";
+import {getVerificationFailedMessage} from "../../../src/utils/json_rpc.js";
 
 const testCases = [eth_getBalance_eoa, eth_getBalance_contract];
 
@@ -46,7 +47,7 @@ describe("verified_requests / eth_getBalance", () => {
         expect(response).to.eql({
           jsonrpc: "2.0",
           id: data.request.id,
-          error: {code: UNVERIFIED_RESPONSE_CODE, message: "eth_getBalance request can not be verified."},
+          error: {code: VERIFICATION_FAILED_RESPONSE_CODE, message: getVerificationFailedMessage("eth_getBalance")},
         });
       });
     });