From 4829ff8aa0e23f668f8e70952b39187ec724b8ff Mon Sep 17 00:00:00 2001 From: Garvit Khatri Date: Fri, 7 Jun 2024 20:36:33 +0530 Subject: [PATCH 1/6] set default timeout to transport - PIM-903 --- .../permissionless/actions/smartAccount/deployContract.ts | 5 +++-- .../permissionless/actions/smartAccount/sendTransaction.ts | 3 ++- .../permissionless/actions/smartAccount/sendTransactions.ts | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/permissionless/actions/smartAccount/deployContract.ts b/packages/permissionless/actions/smartAccount/deployContract.ts index 8539e873..f0a7e806 100644 --- a/packages/permissionless/actions/smartAccount/deployContract.ts +++ b/packages/permissionless/actions/smartAccount/deployContract.ts @@ -14,7 +14,7 @@ import type { EntryPoint } from "../../types/entrypoint" import { parseAccount } from "../../utils/" import { AccountOrClientNotFoundError } from "../../utils/signUserOperationHashWithECDSA" import { waitForUserOperationReceipt } from "../bundler/waitForUserOperationReceipt" -import { type Middleware } from "./prepareUserOperationRequest" +import type { Middleware } from "./prepareUserOperationRequest" import { sendUserOperation } from "./sendUserOperation" export type DeployContractParametersWithPaymaster< @@ -106,7 +106,8 @@ export async function deployContract< waitForUserOperationReceipt, "waitForUserOperationReceipt" )({ - hash: userOpHash + hash: userOpHash, + timeout: client.transport.timeout }) return userOperationReceipt?.receipt.transactionHash diff --git a/packages/permissionless/actions/smartAccount/sendTransaction.ts b/packages/permissionless/actions/smartAccount/sendTransaction.ts index f87c7243..ebdeb70c 100644 --- a/packages/permissionless/actions/smartAccount/sendTransaction.ts +++ b/packages/permissionless/actions/smartAccount/sendTransaction.ts @@ -138,7 +138,8 @@ export async function sendTransaction< waitForUserOperationReceipt, "waitForUserOperationReceipt" )({ - hash: userOpHash + hash: userOpHash, + timeout: client.transport.timeout }) return userOperationReceipt?.receipt.transactionHash diff --git a/packages/permissionless/actions/smartAccount/sendTransactions.ts b/packages/permissionless/actions/smartAccount/sendTransactions.ts index d8f8829e..b91dc0f9 100644 --- a/packages/permissionless/actions/smartAccount/sendTransactions.ts +++ b/packages/permissionless/actions/smartAccount/sendTransactions.ts @@ -139,7 +139,8 @@ export async function sendTransactions< waitForUserOperationReceipt, "waitForUserOperationReceipt" )({ - hash: userOpHash + hash: userOpHash, + timeout: client.transport.timeout }) return userOperationReceipt?.receipt.transactionHash From d3e320af52a0fd1c9c6ff145fd9da9b59af98aab Mon Sep 17 00:00:00 2001 From: Garvit Khatri Date: Fri, 7 Jun 2024 20:53:42 +0530 Subject: [PATCH 2/6] Default in one place --- .../actions/bundler/waitForUserOperationReceipt.ts | 2 +- packages/permissionless/actions/smartAccount/deployContract.ts | 3 +-- .../permissionless/actions/smartAccount/sendTransaction.ts | 3 +-- .../permissionless/actions/smartAccount/sendTransactions.ts | 3 +-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/permissionless/actions/bundler/waitForUserOperationReceipt.ts b/packages/permissionless/actions/bundler/waitForUserOperationReceipt.ts index f8945da3..676edd0a 100644 --- a/packages/permissionless/actions/bundler/waitForUserOperationReceipt.ts +++ b/packages/permissionless/actions/bundler/waitForUserOperationReceipt.ts @@ -66,7 +66,7 @@ export const waitForUserOperationReceipt = < { hash, pollingInterval = bundlerClient.pollingInterval, - timeout + timeout = bundlerClient.transport.timeout }: Prettify ): Promise> => { const observerId = stringify([ diff --git a/packages/permissionless/actions/smartAccount/deployContract.ts b/packages/permissionless/actions/smartAccount/deployContract.ts index f0a7e806..3782fc9d 100644 --- a/packages/permissionless/actions/smartAccount/deployContract.ts +++ b/packages/permissionless/actions/smartAccount/deployContract.ts @@ -106,8 +106,7 @@ export async function deployContract< waitForUserOperationReceipt, "waitForUserOperationReceipt" )({ - hash: userOpHash, - timeout: client.transport.timeout + hash: userOpHash }) return userOperationReceipt?.receipt.transactionHash diff --git a/packages/permissionless/actions/smartAccount/sendTransaction.ts b/packages/permissionless/actions/smartAccount/sendTransaction.ts index ebdeb70c..f87c7243 100644 --- a/packages/permissionless/actions/smartAccount/sendTransaction.ts +++ b/packages/permissionless/actions/smartAccount/sendTransaction.ts @@ -138,8 +138,7 @@ export async function sendTransaction< waitForUserOperationReceipt, "waitForUserOperationReceipt" )({ - hash: userOpHash, - timeout: client.transport.timeout + hash: userOpHash }) return userOperationReceipt?.receipt.transactionHash diff --git a/packages/permissionless/actions/smartAccount/sendTransactions.ts b/packages/permissionless/actions/smartAccount/sendTransactions.ts index b91dc0f9..d8f8829e 100644 --- a/packages/permissionless/actions/smartAccount/sendTransactions.ts +++ b/packages/permissionless/actions/smartAccount/sendTransactions.ts @@ -139,8 +139,7 @@ export async function sendTransactions< waitForUserOperationReceipt, "waitForUserOperationReceipt" )({ - hash: userOpHash, - timeout: client.transport.timeout + hash: userOpHash }) return userOperationReceipt?.receipt.transactionHash From 35c9235e4b53bebeca572007f7822eb96c7dda53 Mon Sep 17 00:00:00 2001 From: Garvit Khatri Date: Sat, 8 Jun 2024 19:20:57 +0530 Subject: [PATCH 3/6] Add changeset --- .changeset/good-onions-scream.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/good-onions-scream.md diff --git a/.changeset/good-onions-scream.md b/.changeset/good-onions-scream.md new file mode 100644 index 00000000..1d802453 --- /dev/null +++ b/.changeset/good-onions-scream.md @@ -0,0 +1,5 @@ +--- +"permissionless": patch +--- + +Default timeout for waitForUserOperationReceipt is inheritted from bundlerClient.transport From 13fb5914d4eeabc1b4b22720e0bbfbd7232c7544 Mon Sep 17 00:00:00 2001 From: Garvit Khatri Date: Sat, 8 Jun 2024 19:21:45 +0530 Subject: [PATCH 4/6] Fix spelling mistakes --- .changeset/good-onions-scream.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/good-onions-scream.md b/.changeset/good-onions-scream.md index 1d802453..3a7d1ada 100644 --- a/.changeset/good-onions-scream.md +++ b/.changeset/good-onions-scream.md @@ -2,4 +2,4 @@ "permissionless": patch --- -Default timeout for waitForUserOperationReceipt is inheritted from bundlerClient.transport +Default timeout for waitForUserOperationReceipt is inherited from bundlerClient.transport From 76a6056b74b20feccc7205ce849742cb5cb9dd82 Mon Sep 17 00:00:00 2001 From: Garvit Khatri Date: Sun, 9 Jun 2024 17:44:57 +0530 Subject: [PATCH 5/6] Lint --- package.json | 4 +--- .../create-permissionless-app/package.json | 20 +++++++++---------- .../mock-paymaster/src/helpers/schema.ts | 2 +- .../privateKeyToBiconomySmartAccount.ts | 2 +- .../biconomy/signerToBiconomySmartAccount.ts | 10 ++++++++-- .../kernel/signerToEcdsaKernelSmartAccount.ts | 4 ++-- .../accounts/kernel/utils/encodeCallData.ts | 2 +- .../accounts/kernel/utils/getExecMode.ts | 2 +- .../accounts/kernel/utils/getNonceKey.ts | 2 +- .../light/privateKeyToLightSmartAccount.ts | 2 +- .../safe/privateKeyToSafeSmartAccount.ts | 2 +- .../accounts/safe/signerToSafeSmartAccount.ts | 2 +- .../simple/privateKeyToSimpleSmartAccount.ts | 8 +------- .../bundler/estimateUserOperationGas.ts | 9 +-------- .../pimlico/sendCompressedUserOperation.ts | 2 +- .../actions/smartAccount/signMessage.ts | 2 +- .../actions/stackup/sponsorUserOperation.ts | 2 +- .../clients/createSmartAccountClient.ts | 6 +++--- .../clients/decorators/stackup.ts | 2 +- packages/permissionless/index.ts | 2 +- packages/permissionless/package.json | 8 +------- .../getEstimateUserOperationGasError.ts | 4 ++-- .../utils/errors/getSendUserOperationError.ts | 2 +- packages/wagmi-test-demo/src/App.tsx | 4 ++-- .../wagmi/connectors/simpleSmartAccount.ts | 2 +- packages/wagmi/connectors/smartAccount.ts | 2 +- 26 files changed, 47 insertions(+), 62 deletions(-) diff --git a/package.json b/package.json index 3c7e1894..88afb04b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,5 @@ { - "workspaces": [ - "packages/*" - ], + "workspaces": ["packages/*"], "private": true, "author": "Pimlico", "type": "module", diff --git a/packages/create-permissionless-app/package.json b/packages/create-permissionless-app/package.json index 93a8527d..cf10477a 100644 --- a/packages/create-permissionless-app/package.json +++ b/packages/create-permissionless-app/package.json @@ -1,12 +1,12 @@ { - "name": "create-permissionless-app", - "version": "0.0.0", - "description": "", - "main": "index.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "keywords": [], - "author": "", - "license": "ISC" + "name": "create-permissionless-app", + "version": "0.0.0", + "description": "", + "main": "index.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "keywords": [], + "author": "", + "license": "ISC" } diff --git a/packages/permissionless-test/mock-aa-infra/mock-paymaster/src/helpers/schema.ts b/packages/permissionless-test/mock-aa-infra/mock-paymaster/src/helpers/schema.ts index 5bb14062..ca2290b8 100644 --- a/packages/permissionless-test/mock-aa-infra/mock-paymaster/src/helpers/schema.ts +++ b/packages/permissionless-test/mock-aa-infra/mock-paymaster/src/helpers/schema.ts @@ -1,5 +1,5 @@ import { type Hex, getAddress } from "viem" -import { type infer as zodInfer, z } from "zod" +import { z, type infer as zodInfer } from "zod" export enum ValidationErrors { InvalidFields = -32602, diff --git a/packages/permissionless/accounts/biconomy/privateKeyToBiconomySmartAccount.ts b/packages/permissionless/accounts/biconomy/privateKeyToBiconomySmartAccount.ts index 155af1db..3cdd2e0e 100644 --- a/packages/permissionless/accounts/biconomy/privateKeyToBiconomySmartAccount.ts +++ b/packages/permissionless/accounts/biconomy/privateKeyToBiconomySmartAccount.ts @@ -1,4 +1,4 @@ -import { type Chain, type Client, type Hex, type Transport } from "viem" +import type { Chain, Client, Hex, Transport } from "viem" import { privateKeyToAccount } from "viem/accounts" import type { ENTRYPOINT_ADDRESS_V06_TYPE, Prettify } from "../../types" import { diff --git a/packages/permissionless/accounts/biconomy/signerToBiconomySmartAccount.ts b/packages/permissionless/accounts/biconomy/signerToBiconomySmartAccount.ts index 86c748ca..14860e35 100644 --- a/packages/permissionless/accounts/biconomy/signerToBiconomySmartAccount.ts +++ b/packages/permissionless/accounts/biconomy/signerToBiconomySmartAccount.ts @@ -276,7 +276,10 @@ export async function signerToBiconomySmartAccount< account: viemSigner, message }) - const potentiallyIncorrectV = parseInt(signature.slice(-2), 16) + const potentiallyIncorrectV = Number.parseInt( + signature.slice(-2), + 16 + ) if (![27, 28].includes(potentiallyIncorrectV)) { const correctV = potentiallyIncorrectV + 27 signature = (signature.slice(0, -2) + @@ -305,7 +308,10 @@ export async function signerToBiconomySmartAccount< account: viemSigner, ...typedData }) - const potentiallyIncorrectV = parseInt(signature.slice(-2), 16) + const potentiallyIncorrectV = Number.parseInt( + signature.slice(-2), + 16 + ) if (![27, 28].includes(potentiallyIncorrectV)) { const correctV = potentiallyIncorrectV + 27 signature = (signature.slice(0, -2) + diff --git a/packages/permissionless/accounts/kernel/signerToEcdsaKernelSmartAccount.ts b/packages/permissionless/accounts/kernel/signerToEcdsaKernelSmartAccount.ts index bf8b2e3c..4d0795e5 100644 --- a/packages/permissionless/accounts/kernel/signerToEcdsaKernelSmartAccount.ts +++ b/packages/permissionless/accounts/kernel/signerToEcdsaKernelSmartAccount.ts @@ -14,9 +14,9 @@ import { zeroAddress } from "viem" import { + signMessage as _signMessage, getChainId, - readContract, - signMessage as _signMessage + readContract } from "viem/actions" import { getAccountNonce } from "../../actions/public/getAccountNonce" import { getSenderAddress } from "../../actions/public/getSenderAddress" diff --git a/packages/permissionless/accounts/kernel/utils/encodeCallData.ts b/packages/permissionless/accounts/kernel/utils/encodeCallData.ts index 626e0745..4e573e2a 100644 --- a/packages/permissionless/accounts/kernel/utils/encodeCallData.ts +++ b/packages/permissionless/accounts/kernel/utils/encodeCallData.ts @@ -9,7 +9,7 @@ import { import { KernelExecuteAbi } from "../abi/KernelAccountAbi" import { KernelV3ExecuteAbi } from "../abi/KernelV3AccountAbi" import { CALL_TYPE, EXEC_TYPE } from "../constants" -import { type KernelVersion } from "../signerToEcdsaKernelSmartAccount" +import type { KernelVersion } from "../signerToEcdsaKernelSmartAccount" import { getExecMode } from "./getExecMode" export const encodeCallData = ( diff --git a/packages/permissionless/accounts/kernel/utils/getExecMode.ts b/packages/permissionless/accounts/kernel/utils/getExecMode.ts index e33faec0..91d5ba68 100644 --- a/packages/permissionless/accounts/kernel/utils/getExecMode.ts +++ b/packages/permissionless/accounts/kernel/utils/getExecMode.ts @@ -1,5 +1,5 @@ import { type Hex, concatHex, pad } from "viem" -import { CALL_TYPE, EXEC_TYPE } from "../constants" +import type { CALL_TYPE, EXEC_TYPE } from "../constants" export const getExecMode = ({ callType, diff --git a/packages/permissionless/accounts/kernel/utils/getNonceKey.ts b/packages/permissionless/accounts/kernel/utils/getNonceKey.ts index e5f017f9..b8dfbc99 100644 --- a/packages/permissionless/accounts/kernel/utils/getNonceKey.ts +++ b/packages/permissionless/accounts/kernel/utils/getNonceKey.ts @@ -1,6 +1,6 @@ import { type Address, concatHex, maxUint16, pad, toHex } from "viem" import { VALIDATOR_MODE, VALIDATOR_TYPE } from "../constants" -import { type KernelVersion } from "../signerToEcdsaKernelSmartAccount" +import type { KernelVersion } from "../signerToEcdsaKernelSmartAccount" export const getNonceKeyWithEncoding = ( accountVerion: KernelVersion, diff --git a/packages/permissionless/accounts/light/privateKeyToLightSmartAccount.ts b/packages/permissionless/accounts/light/privateKeyToLightSmartAccount.ts index dcc5ab5e..19bb1df3 100644 --- a/packages/permissionless/accounts/light/privateKeyToLightSmartAccount.ts +++ b/packages/permissionless/accounts/light/privateKeyToLightSmartAccount.ts @@ -1,4 +1,4 @@ -import { type Chain, type Client, type Hex, type Transport } from "viem" +import type { Chain, Client, Hex, Transport } from "viem" import { privateKeyToAccount } from "viem/accounts" import type { ENTRYPOINT_ADDRESS_V06_TYPE, Prettify } from "../../types" import { diff --git a/packages/permissionless/accounts/safe/privateKeyToSafeSmartAccount.ts b/packages/permissionless/accounts/safe/privateKeyToSafeSmartAccount.ts index e8fff189..a482cb97 100644 --- a/packages/permissionless/accounts/safe/privateKeyToSafeSmartAccount.ts +++ b/packages/permissionless/accounts/safe/privateKeyToSafeSmartAccount.ts @@ -1,4 +1,4 @@ -import { type Chain, type Client, type Hex, type Transport } from "viem" +import type { Chain, Client, Hex, Transport } from "viem" import { privateKeyToAccount } from "viem/accounts" import type { ENTRYPOINT_ADDRESS_V06_TYPE, Prettify } from "../../types" import { diff --git a/packages/permissionless/accounts/safe/signerToSafeSmartAccount.ts b/packages/permissionless/accounts/safe/signerToSafeSmartAccount.ts index 7dc228fc..fd3e539a 100644 --- a/packages/permissionless/accounts/safe/signerToSafeSmartAccount.ts +++ b/packages/permissionless/accounts/safe/signerToSafeSmartAccount.ts @@ -134,7 +134,7 @@ const adjustVInSignature = ( ): Hex => { const ETHEREUM_V_VALUES = [0, 1, 27, 28] const MIN_VALID_V_VALUE_FOR_SAFE_ECDSA = 27 - let signatureV = parseInt(signature.slice(-2), 16) + let signatureV = Number.parseInt(signature.slice(-2), 16) if (!ETHEREUM_V_VALUES.includes(signatureV)) { throw new Error("Invalid signature") } diff --git a/packages/permissionless/accounts/simple/privateKeyToSimpleSmartAccount.ts b/packages/permissionless/accounts/simple/privateKeyToSimpleSmartAccount.ts index dfbc2f3c..a8fef7e8 100644 --- a/packages/permissionless/accounts/simple/privateKeyToSimpleSmartAccount.ts +++ b/packages/permissionless/accounts/simple/privateKeyToSimpleSmartAccount.ts @@ -1,10 +1,4 @@ -import { - type Address, - type Chain, - type Client, - type Hex, - type Transport -} from "viem" +import type { Address, Chain, Client, Hex, Transport } from "viem" import { privateKeyToAccount } from "viem/accounts" import type { EntryPoint, Prettify } from "../../types" import { diff --git a/packages/permissionless/actions/bundler/estimateUserOperationGas.ts b/packages/permissionless/actions/bundler/estimateUserOperationGas.ts index edb587df..f65d2c66 100644 --- a/packages/permissionless/actions/bundler/estimateUserOperationGas.ts +++ b/packages/permissionless/actions/bundler/estimateUserOperationGas.ts @@ -1,11 +1,4 @@ -import { - type Account, - BaseError, - type Chain, - type Client, - type Hex, - type Transport -} from "viem" +import type { Account, BaseError, Chain, Client, Hex, Transport } from "viem" import type { PartialBy } from "viem/types/utils" import type { BundlerClient } from "../../clients/createBundlerClient" import type { Prettify } from "../../types/" diff --git a/packages/permissionless/actions/pimlico/sendCompressedUserOperation.ts b/packages/permissionless/actions/pimlico/sendCompressedUserOperation.ts index ad64b590..ed47b16e 100644 --- a/packages/permissionless/actions/pimlico/sendCompressedUserOperation.ts +++ b/packages/permissionless/actions/pimlico/sendCompressedUserOperation.ts @@ -8,7 +8,7 @@ import type { Transport } from "viem" import type { Prettify } from "../../types/" -import { type PimlicoBundlerRpcSchema } from "../../types/pimlico" +import type { PimlicoBundlerRpcSchema } from "../../types/pimlico" export type SendCompressedUserOperationParameters = { compressedUserOperation: Hex diff --git a/packages/permissionless/actions/smartAccount/signMessage.ts b/packages/permissionless/actions/smartAccount/signMessage.ts index a5b48c6f..30d7ebf0 100644 --- a/packages/permissionless/actions/smartAccount/signMessage.ts +++ b/packages/permissionless/actions/smartAccount/signMessage.ts @@ -5,7 +5,7 @@ import type { SignMessageReturnType, Transport } from "viem" -import { type SmartAccount } from "../../accounts/types" +import type { SmartAccount } from "../../accounts/types" import type { EntryPoint } from "../../types/entrypoint" import { AccountOrClientNotFoundError, parseAccount } from "../../utils/" diff --git a/packages/permissionless/actions/stackup/sponsorUserOperation.ts b/packages/permissionless/actions/stackup/sponsorUserOperation.ts index 6e333295..3b376c91 100644 --- a/packages/permissionless/actions/stackup/sponsorUserOperation.ts +++ b/packages/permissionless/actions/stackup/sponsorUserOperation.ts @@ -1,6 +1,6 @@ import type { Address, Hex } from "viem" import type { PartialBy } from "viem/types/utils" -import { type StackupPaymasterClient } from "../../clients/stackup" +import type { StackupPaymasterClient } from "../../clients/stackup" import type { ENTRYPOINT_ADDRESS_V06_TYPE, EntryPoint diff --git a/packages/permissionless/clients/createSmartAccountClient.ts b/packages/permissionless/clients/createSmartAccountClient.ts index 9d05170e..f773eebf 100644 --- a/packages/permissionless/clients/createSmartAccountClient.ts +++ b/packages/permissionless/clients/createSmartAccountClient.ts @@ -6,10 +6,10 @@ import type { WalletClientConfig } from "viem" import { createClient } from "viem" -import { type SmartAccount } from "../accounts/types" -import { type Middleware } from "../actions/smartAccount/prepareUserOperationRequest" +import type { SmartAccount } from "../accounts/types" +import type { Middleware } from "../actions/smartAccount/prepareUserOperationRequest" import type { Prettify } from "../types/" -import { type BundlerRpcSchema } from "../types/bundler" +import type { BundlerRpcSchema } from "../types/bundler" import type { EntryPoint } from "../types/entrypoint" import { type SmartAccountActions, diff --git a/packages/permissionless/clients/decorators/stackup.ts b/packages/permissionless/clients/decorators/stackup.ts index 129ef2ca..00f7063d 100644 --- a/packages/permissionless/clients/decorators/stackup.ts +++ b/packages/permissionless/clients/decorators/stackup.ts @@ -9,7 +9,7 @@ import { sponsorUserOperation } from "../../actions/stackup/sponsorUserOperation" import type { EntryPoint } from "../../types/entrypoint" -import { type StackupPaymasterClient } from "../stackup" +import type { StackupPaymasterClient } from "../stackup" export type StackupPaymasterClientActions = { /** diff --git a/packages/permissionless/index.ts b/packages/permissionless/index.ts index ccedfd50..00b387fe 100644 --- a/packages/permissionless/index.ts +++ b/packages/permissionless/index.ts @@ -78,7 +78,7 @@ export { } import type { UserOperation } from "./types/userOperation" -export { type UserOperation } +export type { UserOperation } import type { GetUserOperationHashParams } from "./utils/getUserOperationHash" import { getUserOperationHash } from "./utils/getUserOperationHash" diff --git a/packages/permissionless/package.json b/packages/permissionless/package.json index 26b6ad9d..39cdb3de 100644 --- a/packages/permissionless/package.json +++ b/packages/permissionless/package.json @@ -11,13 +11,7 @@ "type": "module", "sideEffects": false, "description": "A utility library for working with ERC-4337", - "keywords": [ - "ethereum", - "erc-4337", - "eip-4337", - "paymaster", - "bundler" - ], + "keywords": ["ethereum", "erc-4337", "eip-4337", "paymaster", "bundler"], "license": "MIT", "exports": { ".": { diff --git a/packages/permissionless/utils/errors/getEstimateUserOperationGasError.ts b/packages/permissionless/utils/errors/getEstimateUserOperationGasError.ts index 8c162b0c..d3e7ad57 100644 --- a/packages/permissionless/utils/errors/getEstimateUserOperationGasError.ts +++ b/packages/permissionless/utils/errors/getEstimateUserOperationGasError.ts @@ -1,10 +1,10 @@ -import { BaseError, UnknownNodeError } from "viem" +import { type BaseError, UnknownNodeError } from "viem" import type { EstimateUserOperationGasParameters } from "../../actions/bundler/estimateUserOperationGas" import { EstimateUserOperationGasError, type EstimateUserOperationGasErrorType } from "../../errors/estimateUserOperationGas" -import { type ErrorType } from "../../errors/utils" +import type { ErrorType } from "../../errors/utils" import type { EntryPoint } from "../../types/entrypoint" import { type GetBundlerErrorParameters, diff --git a/packages/permissionless/utils/errors/getSendUserOperationError.ts b/packages/permissionless/utils/errors/getSendUserOperationError.ts index 1efa3797..47edcb4e 100644 --- a/packages/permissionless/utils/errors/getSendUserOperationError.ts +++ b/packages/permissionless/utils/errors/getSendUserOperationError.ts @@ -1,4 +1,4 @@ -import { BaseError, UnknownNodeError } from "viem" +import { type BaseError, UnknownNodeError } from "viem" import type { SendUserOperationParameters } from "../../actions/bundler/sendUserOperation" import { SendUserOperationError } from "../../errors" import type { EntryPoint } from "../../types/entrypoint" diff --git a/packages/wagmi-test-demo/src/App.tsx b/packages/wagmi-test-demo/src/App.tsx index 24d4451e..10dd17f9 100644 --- a/packages/wagmi-test-demo/src/App.tsx +++ b/packages/wagmi-test-demo/src/App.tsx @@ -7,9 +7,9 @@ import { safeSmartAccount } from "@permissionless/wagmi" import { createPimlicoPaymasterClient } from "permissionless/clients/pimlico" import { walletClientToSmartAccountSigner } from "permissionless/utils" import React from "react" -import { http, Address, zeroAddress } from "viem" +import { http, type Address, zeroAddress } from "viem" import { - CreateConnectorFn, + type CreateConnectorFn, useAccount, useConfig, useConnect, diff --git a/packages/wagmi/connectors/simpleSmartAccount.ts b/packages/wagmi/connectors/simpleSmartAccount.ts index 4610a06e..d7d876a2 100644 --- a/packages/wagmi/connectors/simpleSmartAccount.ts +++ b/packages/wagmi/connectors/simpleSmartAccount.ts @@ -5,7 +5,7 @@ import { type SmartAccountSigner, signerToSimpleSmartAccount } from "permissionless/accounts" -import { type SponsorUserOperationMiddleware } from "permissionless/actions/smartAccount" +import type { SponsorUserOperationMiddleware } from "permissionless/actions/smartAccount" import type { Prettify } from "permissionless/types" import type { Address, Chain, PublicClient, Transport } from "viem" import { smartAccount } from "./smartAccount" diff --git a/packages/wagmi/connectors/smartAccount.ts b/packages/wagmi/connectors/smartAccount.ts index 75cba706..aabdc918 100644 --- a/packages/wagmi/connectors/smartAccount.ts +++ b/packages/wagmi/connectors/smartAccount.ts @@ -1,5 +1,5 @@ import { type SmartAccountClient, chainId } from "permissionless" -import { type SmartAccount } from "permissionless/accounts" +import type { SmartAccount } from "permissionless/accounts" import type { Chain, Transport } from "viem" import { createConnector } from "wagmi" From 63a4206c901524ac30f890ca94e1de51797a45c6 Mon Sep 17 00:00:00 2001 From: plusminushalf Date: Sun, 9 Jun 2024 12:15:57 +0000 Subject: [PATCH 6/6] chore: format --- .../mock-aa-infra/mock-paymaster/src/helpers/schema.ts | 2 +- .../accounts/kernel/signerToEcdsaKernelSmartAccount.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/permissionless-test/mock-aa-infra/mock-paymaster/src/helpers/schema.ts b/packages/permissionless-test/mock-aa-infra/mock-paymaster/src/helpers/schema.ts index ca2290b8..5bb14062 100644 --- a/packages/permissionless-test/mock-aa-infra/mock-paymaster/src/helpers/schema.ts +++ b/packages/permissionless-test/mock-aa-infra/mock-paymaster/src/helpers/schema.ts @@ -1,5 +1,5 @@ import { type Hex, getAddress } from "viem" -import { z, type infer as zodInfer } from "zod" +import { type infer as zodInfer, z } from "zod" export enum ValidationErrors { InvalidFields = -32602, diff --git a/packages/permissionless/accounts/kernel/signerToEcdsaKernelSmartAccount.ts b/packages/permissionless/accounts/kernel/signerToEcdsaKernelSmartAccount.ts index 4d0795e5..bf8b2e3c 100644 --- a/packages/permissionless/accounts/kernel/signerToEcdsaKernelSmartAccount.ts +++ b/packages/permissionless/accounts/kernel/signerToEcdsaKernelSmartAccount.ts @@ -14,9 +14,9 @@ import { zeroAddress } from "viem" import { - signMessage as _signMessage, getChainId, - readContract + readContract, + signMessage as _signMessage } from "viem/actions" import { getAccountNonce } from "../../actions/public/getAccountNonce" import { getSenderAddress } from "../../actions/public/getSenderAddress"