diff --git a/advanced/wallets/react-wallet-v2/src/lib/smart-accounts/SmartAccountLib.ts b/advanced/wallets/react-wallet-v2/src/lib/smart-accounts/SmartAccountLib.ts index 0962d162a..df9d7964b 100644 --- a/advanced/wallets/react-wallet-v2/src/lib/smart-accounts/SmartAccountLib.ts +++ b/advanced/wallets/react-wallet-v2/src/lib/smart-accounts/SmartAccountLib.ts @@ -326,7 +326,6 @@ export abstract class SmartAccountLib implements EIP155Wallet { const userOpWithStubData: UserOperation<'v0.7'> = { ...userOpPreStubData, ...paymasterStubData, - verificationGasLimit: paymasterStubData.paymasterVerificationGasLimit ?? 0n, signature: '0x' } diff --git a/advanced/wallets/react-wallet-v2/src/utils/EIP155RequestHandlerUtil.ts b/advanced/wallets/react-wallet-v2/src/utils/EIP155RequestHandlerUtil.ts index a61af4a22..1547ebbee 100644 --- a/advanced/wallets/react-wallet-v2/src/utils/EIP155RequestHandlerUtil.ts +++ b/advanced/wallets/react-wallet-v2/src/utils/EIP155RequestHandlerUtil.ts @@ -66,12 +66,12 @@ export async function approveEIP155Request(requestEvent: RequestEventArgs) { const provider = new providers.JsonRpcProvider(EIP155_CHAINS[chainId as TEIP155Chain].rpc) const sendTransaction = request.params[0] const connectedWallet = await wallet.connect(provider) - const txResponse = await connectedWallet.sendTransaction(sendTransaction) + const txResponse = await connectedWallet.sendTransaction({ + to: sendTransaction.to, + value: sendTransaction.value, + data: sendTransaction.data + }) const txHash = typeof txResponse === 'string' ? txResponse : txResponse?.hash - const txReceipt = await txResponse.wait() - console.log( - `Transaction broadcasted on chain ${chainId} , ${{ txHash }}, status: ${txReceipt.status}` - ) return formatJsonRpcResult(id, txHash) } catch (error: any) { console.error(error) diff --git a/advanced/wallets/react-wallet-v2/src/utils/EIP5792RequestHandlerUtils.ts b/advanced/wallets/react-wallet-v2/src/utils/EIP5792RequestHandlerUtils.ts index a57ae9a3d..6a66d7a38 100644 --- a/advanced/wallets/react-wallet-v2/src/utils/EIP5792RequestHandlerUtils.ts +++ b/advanced/wallets/react-wallet-v2/src/utils/EIP5792RequestHandlerUtils.ts @@ -21,7 +21,7 @@ import { } from 'permissionless' import { http, toHex } from 'viem' type RequestEventArgs = Omit -const getCallsReceipt = async (getCallParams: GetCallsParams) => { +const getCallsReceipt = async (getCallParams: GetCallsParams, caip10ChainId: string) => { /** * This is hardcode implementation of wallet_getCallsStatus * as we are not maintaining the data for calls bundled right now. @@ -29,7 +29,8 @@ const getCallsReceipt = async (getCallParams: GetCallsParams) => { */ const apiKey = process.env.NEXT_PUBLIC_PIMLICO_KEY const localBundlerUrl = process.env.NEXT_PUBLIC_LOCAL_BUNDLER_URL - const bundlerUrl = localBundlerUrl || `https://api.pimlico.io/v1/sepolia/rpc?apikey=${apiKey}` + const chainId = caip10ChainId.split(':')[1] + const bundlerUrl = localBundlerUrl || `https://api.pimlico.io/v1/${chainId}/rpc?apikey=${apiKey}` const bundlerClient = createBundlerClient({ entryPoint: ENTRYPOINT_ADDRESS_V07, transport: http(bundlerUrl) @@ -74,7 +75,7 @@ export async function approveEIP5792Request(requestEvent: RequestEventArgs) { case EIP5792_METHODS.WALLET_GET_CALLS_STATUS: { try { const getCallParams = request.params[0] as GetCallsParams - const receipt = await getCallsReceipt(getCallParams) + const receipt = await getCallsReceipt(getCallParams, chainId) return formatJsonRpcResult(id, receipt) } catch (error: any) { console.error(error)