From ec93a3f33e934246f15bf0afd0ddd23b268abe40 Mon Sep 17 00:00:00 2001 From: Will Cory Date: Thu, 25 Jan 2024 20:45:10 -0800 Subject: [PATCH] :recycle: Update actions types to consistent api :white_check_mark: Fix build: :recycle: Regenerate --- extensions/viem/src/tevmViemExtension.js | 10 ++-- .../memory-client/src/createMemoryClient.js | 4 +- .../procedures/src/eth/ethCallProcedure.js | 60 +++++++++---------- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/extensions/viem/src/tevmViemExtension.js b/extensions/viem/src/tevmViemExtension.js index bfe72c45c4..12772fb700 100644 --- a/extensions/viem/src/tevmViemExtension.js +++ b/extensions/viem/src/tevmViemExtension.js @@ -63,7 +63,7 @@ export const tevmViemExtension = () => { */ const request = async (req) => { try { - const result = await client.request(/** @type any*/ (req)) + const result = await client.request(/** @type any*/(req)) return /** @type any */ ({ jsonrpc: '2.0', method: req.method, @@ -103,7 +103,7 @@ export const tevmViemExtension = () => { ...getCallArgs(params), deployedBytecode: params.deployedBytecode, data: encodeFunctionData( - /** @type any*/ ({ + /** @type any*/({ abi: params.abi, functionName: params.functionName, args: params.args, @@ -114,7 +114,7 @@ export const tevmViemExtension = () => { ) ) out.data = decodeFunctionResult( - /** @type any*/ ({ + /** @type any*/({ data: out.rawData, abi: params.abi, functionName: params.functionName, @@ -253,7 +253,7 @@ export const tevmViemExtension = () => { const out = await call({ ...params, data: encodeFunctionData( - /** @type any*/ ({ + /** @type any*/({ abi: params.abi, functionName: params.functionName, args: params.args, @@ -262,7 +262,7 @@ export const tevmViemExtension = () => { }) const data = decodeFunctionResult( - /** @type any*/ ({ + /** @type any*/({ data: out.rawData, abi: params.abi, functionName: params.functionName, diff --git a/packages/memory-client/src/createMemoryClient.js b/packages/memory-client/src/createMemoryClient.js index 8726641f40..5275848a4a 100644 --- a/packages/memory-client/src/createMemoryClient.js +++ b/packages/memory-client/src/createMemoryClient.js @@ -100,9 +100,9 @@ export const createMemoryClient = async (options = {}) => { header: common.genesis(), ...(common.isActivatedEIP(4895) ? { - withdrawals: + withdrawals: /** @type {Array}*/ ([]), - } + } : {}), }, { common, setHardfork: false, skipConsensusFormatValidation: true }, diff --git a/packages/procedures/src/eth/ethCallProcedure.js b/packages/procedures/src/eth/ethCallProcedure.js index 3ab31f9527..4d3ae54c81 100644 --- a/packages/procedures/src/eth/ethCallProcedure.js +++ b/packages/procedures/src/eth/ethCallProcedure.js @@ -6,34 +6,34 @@ import { callProcedure } from '../index.js' * @returns {import('@tevm/procedures-types').EthCallJsonRpcProcedure} */ export const ethCallProcedure = (evm) => async (req) => { - const [tx, blockTag] = req.params - const { data, from, to, gas, gasPrice, value } = tx - const response = await callProcedure(evm)({ - ...(req.id !== undefined ? { id: req.id } : {}), - jsonrpc: req.jsonrpc, - method: 'tevm_call', - params: { - ...(gasPrice !== undefined ? { gasPrice } : {}), - ...(data !== undefined ? { data } : {}), - ...(gas !== undefined ? { gas } : {}), - ...(value !== undefined ? { value } : {}), - ...(to !== undefined ? { to } : {}), - ...(from !== undefined ? { from } : {}), - ...(blockTag !== undefined ? { blockTag } : {}), - }, - }) - if (!response.result) { - return { - jsonrpc: req.jsonrpc, - method: 'eth_call', - error: response.error, - ...(req.id !== undefined ? { id: req.id } : {}), - } - } - return { - jsonrpc: req.jsonrpc, - method: 'eth_call', - result: response.result.rawData, - ...(req.id !== undefined ? { id: req.id } : {}), - } + const [tx, blockTag] = req.params + const { data, from, to, gas, gasPrice, value } = tx + const response = await callProcedure(evm)({ + ...(req.id !== undefined ? { id: req.id } : {}), + jsonrpc: req.jsonrpc, + method: 'tevm_call', + params: { + ...(gasPrice !== undefined ? { gasPrice } : {}), + ...(data !== undefined ? { data } : {}), + ...(gas !== undefined ? { gas } : {}), + ...(value !== undefined ? { value } : {}), + ...(to !== undefined ? { to } : {}), + ...(from !== undefined ? { from } : {}), + ...(blockTag !== undefined ? { blockTag } : {}), + }, + }) + if (!response.result) { + return { + jsonrpc: req.jsonrpc, + method: 'eth_call', + error: response.error, + ...(req.id !== undefined ? { id: req.id } : {}), + } + } + return { + jsonrpc: req.jsonrpc, + method: 'eth_call', + result: response.result.rawData, + ...(req.id !== undefined ? { id: req.id } : {}), + } }