From 5592af7123f66cbde59b9d8466a4a616efc26664 Mon Sep 17 00:00:00 2001 From: Sahil Vasava Date: Thu, 25 Apr 2024 13:29:07 +0530 Subject: [PATCH 1/3] chore: fix type errors while building and set ts to explicitly 5.3.x --- bun.lockb | Bin 211408 -> 212960 bytes package.json | 2 +- packages/presets/package.json | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bun.lockb b/bun.lockb index ad43e30f3c37508e9e640c86fc8dae50f7b9afb0..548c32e833db95b12b2872a97f5b3f2f11722dd6 100755 GIT binary patch delta 41374 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 delta 40710 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 diff --git a/package.json b/package.json index 0bd9961e..34cc46e5 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "simple-git-hooks": "^2.9.0", "size-limit": "^9.0.0", "tslib": "^2.6.2", - "typescript": "^5.2.2" + "typescript": "~5.3.0" }, "description": "", "keywords": [], diff --git a/packages/presets/package.json b/packages/presets/package.json index caf1de91..733049a0 100644 --- a/packages/presets/package.json +++ b/packages/presets/package.json @@ -49,7 +49,7 @@ "lint:fix": "bun run lint --apply" }, "peerDependencies": { - "typescript": "^5.0.0", + "typescript": "~5.3.0", "@zerodev/sdk": "^5.2.1", "@zerodev/ecdsa-validator": "^5.2.1", "permissionless": "^0.1.18", From 572808a21e14d9970ffc9f0ad19d2e6656a61e36 Mon Sep 17 00:00:00 2001 From: Sahil Vasava Date: Thu, 25 Apr 2024 13:57:35 +0530 Subject: [PATCH 2/3] style: fix styling as per biome --- biome.json | 3 +- package.json | 74 ++++++------ .../account/ep0_6/encodeDeployCallData.ts | 2 +- .../account/ep0_7/encodeDeployCallData.ts | 2 +- .../kernel/v1/createKernelV1Account.ts | 4 +- .../kernel/v2/createKernelV2Account.ts | 2 +- packages/core/accounts/utils/multisend.ts | 5 +- packages/core/clients/decorators/kernel.ts | 4 +- packages/core/clients/kernelAccountClient.ts | 2 +- packages/core/constants.ts | 2 +- packages/core/package.json | 8 +- .../core/providers/KernelEIP1193Provider.ts | 12 +- packages/core/types/kernel.ts | 4 +- packages/core/utils.ts | 4 +- packages/presets/package.json | 108 +++++++++--------- packages/test/config.ts | 4 +- packages/test/ecdsaKernelAccount.test.ts | 20 ++-- packages/test/kernelV1Account.test.ts | 14 +-- packages/test/kernelV2Account.test.ts | 18 +-- .../modularPermissionKernelAccount.test.ts | 16 +-- packages/test/recoveryKernelAccount.test.ts | 13 ++- packages/test/sessionKeyKernelAccount.test.ts | 18 +-- packages/test/utils.ts | 24 ++-- packages/test/v0.7/ecdsaKernelAccount.test.ts | 22 ++-- .../test/v0.7/permissionValidator.test.ts | 24 ++-- .../test/v0.7/recoveryKernelAccount.test.ts | 14 +-- packages/test/v0.7/remoteSigner.test.ts | 18 +-- packages/test/v0.7/utils.ts | 30 ++--- .../test/v0.7/weightedECDSAValidator.test.ts | 15 ++- .../test/weightedEcdsaKernelAccount.test.ts | 14 +-- plugins/ecdsa/toECDSAValidatorPlugin.ts | 16 +-- .../deserializeModularPermissionAccount.ts | 2 +- plugins/modularPermission/policies/types.ts | 6 +- .../signers/toECDSASigner.ts | 2 +- .../signers/toWebAuthnPubKey.ts | 2 +- plugins/modularPermission/signers/types.ts | 2 +- .../toModularPermissionValidatorPlugin.ts | 10 +- plugins/modularPermission/types.ts | 16 +-- .../deserializePermissionAccount.ts | 2 +- plugins/permission/policies/types.ts | 12 +- plugins/permission/signers/toECDSASigner.ts | 2 +- .../permission/signers/toEmptyECDSASigner.ts | 2 +- .../permission/signers/toWebAuthnPubKey.ts | 2 +- plugins/permission/types.ts | 4 +- plugins/session-key/revokeSessionKey.ts | 2 +- plugins/session-key/types.ts | 32 +++--- 46 files changed, 303 insertions(+), 311 deletions(-) diff --git a/biome.json b/biome.json index 6c0cf001..3e1a74b5 100644 --- a/biome.json +++ b/biome.json @@ -26,7 +26,8 @@ }, "style": { "noUnusedTemplateLiteral": "warn", - "noUselessElse": "off" + "noUselessElse": "off", + "useNodejsImportProtocol": "off" } } }, diff --git a/package.json b/package.json index 34cc46e5..d55f46a1 100644 --- a/package.json +++ b/package.json @@ -1,41 +1,37 @@ { - "workspaces": [ - "packages/*", - "templates/*", - "plugins/*" - ], - "private": true, - "author": "ZeroDev", - "type": "module", - "sideEffects": false, - "devDependencies": { - "@ambire/signature-validator": "^1.3.1", - "@biomejs/biome": "^1.0.0", - "@changesets/changelog-git": "^0.1.14", - "@changesets/changelog-github": "^0.4.8", - "@changesets/cli": "^2.26.2", - "@size-limit/esbuild-why": "^9.0.0", - "@size-limit/preset-small-lib": "^9.0.0", - "ethers": "5", - "rimraf": "^5.0.1", - "simple-git-hooks": "^2.9.0", - "size-limit": "^9.0.0", - "tslib": "^2.6.2", - "typescript": "~5.3.0" - }, - "description": "", - "keywords": [], - "license": "MIT", - "scripts": { - "build": "bash build-all.sh", - "format": "biome format . --write", - "lint": "biome check .", - "lint:fix": "bun run lint --apply", - "changeset": "changeset", - "changeset:release": "bun run build && changeset publish", - "changeset:version": "changeset version && bun install --lockfile-only" - }, - "simple-git-hooks": { - "pre-commit": "bun run format && bun run lint:fix" - } + "workspaces": ["packages/*", "templates/*", "plugins/*"], + "private": true, + "author": "ZeroDev", + "type": "module", + "sideEffects": false, + "devDependencies": { + "@ambire/signature-validator": "^1.3.1", + "@biomejs/biome": "^1.0.0", + "@changesets/changelog-git": "^0.1.14", + "@changesets/changelog-github": "^0.4.8", + "@changesets/cli": "^2.26.2", + "@size-limit/esbuild-why": "^9.0.0", + "@size-limit/preset-small-lib": "^9.0.0", + "ethers": "5", + "rimraf": "^5.0.1", + "simple-git-hooks": "^2.9.0", + "size-limit": "^9.0.0", + "tslib": "^2.6.2", + "typescript": "~5.3.0" + }, + "description": "", + "keywords": [], + "license": "MIT", + "scripts": { + "build": "bash build-all.sh", + "format": "biome format . --write", + "lint": "biome check .", + "lint:fix": "bun run lint --apply", + "changeset": "changeset", + "changeset:release": "bun run build && changeset publish", + "changeset:version": "changeset version && bun install --lockfile-only" + }, + "simple-git-hooks": { + "pre-commit": "bun run format && bun run lint:fix" + } } diff --git a/packages/core/accounts/kernel/utils/account/ep0_6/encodeDeployCallData.ts b/packages/core/accounts/kernel/utils/account/ep0_6/encodeDeployCallData.ts index 55f2e3ab..7ad93adf 100644 --- a/packages/core/accounts/kernel/utils/account/ep0_6/encodeDeployCallData.ts +++ b/packages/core/accounts/kernel/utils/account/ep0_6/encodeDeployCallData.ts @@ -1,4 +1,4 @@ -import { toSmartAccount } from "permissionless/accounts" +import type { toSmartAccount } from "permissionless/accounts" import { encodeDeployData } from "viem" import { safeCreateCallAddress } from "../../../../../constants.js" import { encodeSafeCreateCall } from "../../common/encodeSafeCreateCall.js" diff --git a/packages/core/accounts/kernel/utils/account/ep0_7/encodeDeployCallData.ts b/packages/core/accounts/kernel/utils/account/ep0_7/encodeDeployCallData.ts index 5a1c4ecf..c457faac 100644 --- a/packages/core/accounts/kernel/utils/account/ep0_7/encodeDeployCallData.ts +++ b/packages/core/accounts/kernel/utils/account/ep0_7/encodeDeployCallData.ts @@ -1,4 +1,4 @@ -import { toSmartAccount } from "permissionless/accounts" +import type { toSmartAccount } from "permissionless/accounts" import { encodeDeployData } from "viem" import { EXEC_TYPE, safeCreateCallAddress } from "../../../../../constants.js" import { encodeSafeCreateCall } from "../../common/encodeSafeCreateCall.js" diff --git a/packages/core/accounts/kernel/v1/createKernelV1Account.ts b/packages/core/accounts/kernel/v1/createKernelV1Account.ts index 1ffa09bf..d966e564 100644 --- a/packages/core/accounts/kernel/v1/createKernelV1Account.ts +++ b/packages/core/accounts/kernel/v1/createKernelV1Account.ts @@ -29,7 +29,7 @@ import { } from "viem" import { toAccount } from "viem/accounts" import { getChainId, signMessage, signTypedData } from "viem/actions" -import { type KernelEncodeCallDataArgs } from "../../../types/kernel.js" +import type { KernelEncodeCallDataArgs } from "../../../types/kernel.js" import { wrapSignatureWith6492 } from "../../utils/6492.js" import { parseFactoryAddressAndCallDataFromAccountInitCode } from "../../utils/index.js" import { @@ -37,7 +37,7 @@ import { encodeMultiSend, multiSendAbi } from "../../utils/multisend.js" -import { type KernelSmartAccount } from "../createKernelAccount.js" +import type { KernelSmartAccount } from "../createKernelAccount.js" export type KernelV1SmartAccount< entryPoint extends EntryPoint, diff --git a/packages/core/accounts/kernel/v2/createKernelV2Account.ts b/packages/core/accounts/kernel/v2/createKernelV2Account.ts index c0134e5a..23a2e1dc 100644 --- a/packages/core/accounts/kernel/v2/createKernelV2Account.ts +++ b/packages/core/accounts/kernel/v2/createKernelV2Account.ts @@ -44,7 +44,7 @@ import { isKernelPluginManager, toKernelPluginManager } from "../../utils/toKernelPluginManager.js" -import { type KernelSmartAccount } from "../createKernelAccount.js" +import type { KernelSmartAccount } from "../createKernelAccount.js" import { KernelAccountV2Abi } from "./abi/KernelAccountV2Abi.js" import { KernelFactoryV2Abi } from "./abi/KernelFactoryV2Abi.js" diff --git a/packages/core/accounts/utils/multisend.ts b/packages/core/accounts/utils/multisend.ts index dd8d273d..acaab166 100644 --- a/packages/core/accounts/utils/multisend.ts +++ b/packages/core/accounts/utils/multisend.ts @@ -1,8 +1,5 @@ import { type Address, type Hex, encodePacked, toBytes } from "viem" -import { - type CallType, - type KernelEncodeCallDataArgs -} from "../../types/index.js" +import type { CallType, KernelEncodeCallDataArgs } from "../../types/index.js" export const MULTISEND_ADDRESS = "0x8ae01fcf7c655655ff2c6ef907b8b4718ab4e17c" diff --git a/packages/core/clients/decorators/kernel.ts b/packages/core/clients/decorators/kernel.ts index 8c9c56fc..e7cc69ad 100644 --- a/packages/core/clients/decorators/kernel.ts +++ b/packages/core/clients/decorators/kernel.ts @@ -1,8 +1,8 @@ import { type SmartAccountActions, smartAccountActions } from "permissionless" -import { type Middleware } from "permissionless/actions/smartAccount" +import type { Middleware } from "permissionless/actions/smartAccount" import type { EntryPoint, Prettify } from "permissionless/types" import type { Chain, Client, Transport } from "viem" -import { type KernelSmartAccount } from "../../accounts/index.js" +import type { KernelSmartAccount } from "../../accounts/index.js" import { type GetUserOperationGasPriceReturnType, getUserOperationGasPrice diff --git a/packages/core/clients/kernelAccountClient.ts b/packages/core/clients/kernelAccountClient.ts index 2eef7def..617afa0a 100644 --- a/packages/core/clients/kernelAccountClient.ts +++ b/packages/core/clients/kernelAccountClient.ts @@ -11,7 +11,7 @@ import { type Transport, createClient } from "viem" -import { type KernelSmartAccount } from "../accounts/index.js" +import type { KernelSmartAccount } from "../accounts/index.js" import { getUserOperationGasPrice } from "../actions/account-client/getUserOperationGasPrice.js" import { type KernelAccountClientActions, diff --git a/packages/core/constants.ts b/packages/core/constants.ts index c9660b4a..ae89d4ce 100644 --- a/packages/core/constants.ts +++ b/packages/core/constants.ts @@ -1,5 +1,5 @@ import type { EntryPointVersion } from "permissionless/types/entrypoint" -import { type Address, type Hex } from "viem" +import type { Address, Hex } from "viem" export const DUMMY_ECDSA_SIG = "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c" diff --git a/packages/core/package.json b/packages/core/package.json index 32d9195d..44ab02ad 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -9,13 +9,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", "files": [ "_esm", diff --git a/packages/core/providers/KernelEIP1193Provider.ts b/packages/core/providers/KernelEIP1193Provider.ts index 127e3113..cf22643a 100644 --- a/packages/core/providers/KernelEIP1193Provider.ts +++ b/packages/core/providers/KernelEIP1193Provider.ts @@ -1,11 +1,11 @@ import { EventEmitter } from "events" -import { type KernelAccountClient } from "@zerodev/sdk" +import type { KernelAccountClient } from "@zerodev/sdk" import type { EntryPoint } from "permissionless/types" -import { - type EIP1193Parameters, - type EIP1193RequestFn, - type Hash, - type SendTransactionParameters +import type { + EIP1193Parameters, + EIP1193RequestFn, + Hash, + SendTransactionParameters } from "viem" export class KernelEIP1193Provider< diff --git a/packages/core/types/kernel.ts b/packages/core/types/kernel.ts index 441b6c36..3648b9da 100644 --- a/packages/core/types/kernel.ts +++ b/packages/core/types/kernel.ts @@ -7,9 +7,9 @@ import type { UserOperation, UserOperationWithBigIntAsHex } from "permissionless/types/userOperation" -import { type Address, type Hex, type LocalAccount } from "viem" +import type { Address, Hex, LocalAccount } from "viem" import type { PartialBy } from "viem/types/utils" -import { VALIDATOR_TYPE } from "../constants.js" +import type { VALIDATOR_TYPE } from "../constants.js" export type ZeroDevPaymasterRpcSchema = [ { Method: "zd_sponsorUserOperation" diff --git a/packages/core/utils.ts b/packages/core/utils.ts index 50b14029..4b1238d1 100644 --- a/packages/core/utils.ts +++ b/packages/core/utils.ts @@ -15,8 +15,8 @@ import { } from "viem" import type { ZeroDevPaymasterClient } from "./clients/paymasterClient.js" import { - CALL_TYPE, - EXEC_TYPE, + type CALL_TYPE, + type EXEC_TYPE, KernelImplToVersionMap, LATEST_KERNEL_VERSION } from "./constants.js" diff --git a/packages/presets/package.json b/packages/presets/package.json index 733049a0..cae9751f 100644 --- a/packages/presets/package.json +++ b/packages/presets/package.json @@ -1,58 +1,58 @@ { - "name": "@zerodev/presets", - "version": "5.2.2", - "author": "ZeroDev", - "main": "./_cjs/index.js", - "module": "./_esm/index.js", - "types": "./_types/index.d.ts", - "typings": "./_types/index.d.ts", - "type": "module", - "devDependencies": { - "bun-types": "latest" - }, - "exports": { - ".": { - "types": "./_types/zerodev/index.d.ts", - "import": "./_esm/zerodev/index.js", - "default": "./_cjs/zerodev/index.js" + "name": "@zerodev/presets", + "version": "5.2.2", + "author": "ZeroDev", + "main": "./_cjs/index.js", + "module": "./_esm/index.js", + "types": "./_types/index.d.ts", + "typings": "./_types/index.d.ts", + "type": "module", + "devDependencies": { + "bun-types": "latest" }, - "./zerodev": { - "types": "./_types/zerodev/index.d.ts", - "import": "./_esm/zerodev/index.js", - "default": "./_cjs/zerodev/index.js" + "exports": { + ".": { + "types": "./_types/zerodev/index.d.ts", + "import": "./_esm/zerodev/index.js", + "default": "./_cjs/zerodev/index.js" + }, + "./zerodev": { + "types": "./_types/zerodev/index.d.ts", + "import": "./_esm/zerodev/index.js", + "default": "./_cjs/zerodev/index.js" + } + }, + "license": "MIT", + "files": [ + "_esm", + "_cjs", + "_types", + "./**/*.ts", + "!_esm/**/*.tsbuildinfo", + "!_cjs/**/*.tsbuildinfo", + "!_types/**/*.tsbuildinfo", + "!.env", + "!./**/*.test.ts", + "!.changeset" + ], + "scripts": { + "build": "bun run clean && bun run build:cjs && bun run build:esm && bun run build:types", + "build:cjs": "tsc --project ./tsconfig.build.json --module commonjs --outDir ./_cjs --removeComments --verbatimModuleSyntax false && printf '{\"type\":\"commonjs\"}' > ./_cjs/package.json", + "build:esm": "tsc --project ./tsconfig.build.json --module es2015 --outDir ./_esm && printf '{\"type\": \"module\",\"sideEffects\":false}' > ./_esm/package.json", + "build:types": "tsc --project ./tsconfig.build.json --module esnext --declarationDir ./_types --emitDeclarationOnly --declaration --declarationMap", + "clean": "rimraf _esm _cjs _types", + "changeset": "changeset", + "changeset:release": "bun run build && changeset publish", + "changeset:version": "changeset version && bun install --lockfile-only", + "format": "biome format . --write", + "lint": "biome check .", + "lint:fix": "bun run lint --apply" + }, + "peerDependencies": { + "typescript": "~5.3.0", + "@zerodev/sdk": "^5.2.1", + "@zerodev/ecdsa-validator": "^5.2.1", + "permissionless": "^0.1.18", + "viem": "^2.9.17" } - }, - "license": "MIT", - "files": [ - "_esm", - "_cjs", - "_types", - "./**/*.ts", - "!_esm/**/*.tsbuildinfo", - "!_cjs/**/*.tsbuildinfo", - "!_types/**/*.tsbuildinfo", - "!.env", - "!./**/*.test.ts", - "!.changeset" - ], - "scripts": { - "build": "bun run clean && bun run build:cjs && bun run build:esm && bun run build:types", - "build:cjs": "tsc --project ./tsconfig.build.json --module commonjs --outDir ./_cjs --removeComments --verbatimModuleSyntax false && printf '{\"type\":\"commonjs\"}' > ./_cjs/package.json", - "build:esm": "tsc --project ./tsconfig.build.json --module es2015 --outDir ./_esm && printf '{\"type\": \"module\",\"sideEffects\":false}' > ./_esm/package.json", - "build:types": "tsc --project ./tsconfig.build.json --module esnext --declarationDir ./_types --emitDeclarationOnly --declaration --declarationMap", - "clean": "rimraf _esm _cjs _types", - "changeset": "changeset", - "changeset:release": "bun run build && changeset publish", - "changeset:version": "changeset version && bun install --lockfile-only", - "format": "biome format . --write", - "lint": "biome check .", - "lint:fix": "bun run lint --apply" - }, - "peerDependencies": { - "typescript": "~5.3.0", - "@zerodev/sdk": "^5.2.1", - "@zerodev/ecdsa-validator": "^5.2.1", - "permissionless": "^0.1.18", - "viem": "^2.9.17" - } } diff --git a/packages/test/config.ts b/packages/test/config.ts index 3428fbb4..53aaeb2d 100644 --- a/packages/test/config.ts +++ b/packages/test/config.ts @@ -1,5 +1,5 @@ -import { EntryPointVersion } from "permissionless/types/entrypoint" -import { Chain } from "viem" +import type { EntryPointVersion } from "permissionless/types/entrypoint" +import type { Chain } from "viem" import { polygonMumbai, sepolia } from "viem/chains" export const config: { diff --git a/packages/test/ecdsaKernelAccount.test.ts b/packages/test/ecdsaKernelAccount.test.ts index f8f774a7..6bc89d2c 100644 --- a/packages/test/ecdsaKernelAccount.test.ts +++ b/packages/test/ecdsaKernelAccount.test.ts @@ -9,8 +9,8 @@ import { constants, EIP1271Abi, KERNEL_ADDRESSES, - KernelAccountClient, - KernelSmartAccount, + type KernelAccountClient, + type KernelSmartAccount, createKernelAccount, getCustomNonceKeyFromString, getERC20PaymasterApproveCall, @@ -19,17 +19,17 @@ import { import { gasTokenAddresses } from "@zerodev/sdk" import dotenv from "dotenv" import { ethers } from "ethers" -import { BundlerClient, ENTRYPOINT_ADDRESS_V06 } from "permissionless" +import { type BundlerClient, ENTRYPOINT_ADDRESS_V06 } from "permissionless" import { SignTransactionNotSupportedBySmartAccount } from "permissionless/accounts" -import { EntryPoint } from "permissionless/types/entrypoint.js" +import type { EntryPoint } from "permissionless/types/entrypoint.js" import { - Address, - Chain, - GetContractReturnType, - Hex, - PrivateKeyAccount, + type Address, + type Chain, + type GetContractReturnType, + type Hex, + type PrivateKeyAccount, type PublicClient, - Transport, + type Transport, decodeEventLog, encodeFunctionData, erc20Abi, diff --git a/packages/test/kernelV1Account.test.ts b/packages/test/kernelV1Account.test.ts index dcfc3a35..f675a499 100644 --- a/packages/test/kernelV1Account.test.ts +++ b/packages/test/kernelV1Account.test.ts @@ -4,27 +4,27 @@ import { verifyMessage } from "@ambire/signature-validator" import { EIP1271Abi, KERNEL_ADDRESSES, - KernelAccountClient, - KernelSmartAccount, + type KernelAccountClient, + type KernelSmartAccount, getERC20PaymasterApproveCall } from "@zerodev/sdk" import { gasTokenAddresses } from "@zerodev/sdk" import { KernelV1SmartAccount } from "@zerodev/sdk/accounts/kernel/v1/createKernelV1Account.js" import dotenv from "dotenv" import { ethers } from "ethers" -import { BundlerClient } from "permissionless" +import type { BundlerClient } from "permissionless" import { SignTransactionNotSupportedBySmartAccount, SmartAccount } from "permissionless/accounts" -import { EntryPoint } from "permissionless/types/entrypoint.js" +import type { EntryPoint } from "permissionless/types/entrypoint.js" import type { UserOperation } from "permissionless/types/userOperation.js" import { - Address, - Chain, + type Address, + type Chain, Hex, type PublicClient, - Transport, + type Transport, decodeEventLog, encodeFunctionData, erc20Abi, diff --git a/packages/test/kernelV2Account.test.ts b/packages/test/kernelV2Account.test.ts index 582722f7..4db507f8 100644 --- a/packages/test/kernelV2Account.test.ts +++ b/packages/test/kernelV2Account.test.ts @@ -4,27 +4,27 @@ import { verifyMessage } from "@ambire/signature-validator" import { EIP1271Abi, KERNEL_ADDRESSES, - KernelAccountClient, - KernelSmartAccount, + type KernelAccountClient, + type KernelSmartAccount, getERC20PaymasterApproveCall } from "@zerodev/sdk" import { gasTokenAddresses } from "@zerodev/sdk" import dotenv from "dotenv" import { ethers } from "ethers" -import { BundlerClient } from "permissionless" +import type { BundlerClient } from "permissionless" import { SignTransactionNotSupportedBySmartAccount, SmartAccount } from "permissionless/accounts" -import { EntryPoint } from "permissionless/types/entrypoint.js" +import type { EntryPoint } from "permissionless/types/entrypoint.js" import type { UserOperation } from "permissionless/types/userOperation.js" import { - Address, - Chain, - Hex, - PrivateKeyAccount, + type Address, + type Chain, + type Hex, + type PrivateKeyAccount, type PublicClient, - Transport, + type Transport, decodeEventLog, encodeFunctionData, erc20Abi, diff --git a/packages/test/modularPermissionKernelAccount.test.ts b/packages/test/modularPermissionKernelAccount.test.ts index 99525c60..c2ec6a47 100644 --- a/packages/test/modularPermissionKernelAccount.test.ts +++ b/packages/test/modularPermissionKernelAccount.test.ts @@ -1,14 +1,14 @@ // @ts-expect-error import { beforeAll, describe, expect, test } from "bun:test" -import { KernelAccountClient, KernelSmartAccount } from "@zerodev/sdk" -import { EntryPoint } from "permissionless/_types/types" +import type { KernelAccountClient, KernelSmartAccount } from "@zerodev/sdk" +import type { EntryPoint } from "permissionless/_types/types" import { - Address, - Chain, - Hex, - PrivateKeyAccount, - PublicClient, - Transport, + type Address, + type Chain, + type Hex, + type PrivateKeyAccount, + type PublicClient, + type Transport, encodeFunctionData, pad, zeroAddress diff --git a/packages/test/recoveryKernelAccount.test.ts b/packages/test/recoveryKernelAccount.test.ts index 03532164..9d83892d 100644 --- a/packages/test/recoveryKernelAccount.test.ts +++ b/packages/test/recoveryKernelAccount.test.ts @@ -1,10 +1,15 @@ // @ts-expect-error import { beforeAll, describe, expect, test } from "bun:test" -import { KernelAccountClient, KernelSmartAccount } from "@zerodev/sdk" +import type { KernelAccountClient, KernelSmartAccount } from "@zerodev/sdk" import dotenv from "dotenv" -import { BundlerClient, bundlerActions } from "permissionless" -import { EntryPoint } from "permissionless/types/entrypoint.js" -import { Chain, type PublicClient, Transport, zeroAddress } from "viem" +import { type BundlerClient, bundlerActions } from "permissionless" +import type { EntryPoint } from "permissionless/types/entrypoint.js" +import { + type Chain, + type PublicClient, + type Transport, + zeroAddress +} from "viem" import { generatePrivateKey } from "viem/accounts" import { getEcdsaKernelAccountWithPrivateKey, diff --git a/packages/test/sessionKeyKernelAccount.test.ts b/packages/test/sessionKeyKernelAccount.test.ts index 6cb6420b..c8c85691 100644 --- a/packages/test/sessionKeyKernelAccount.test.ts +++ b/packages/test/sessionKeyKernelAccount.test.ts @@ -2,8 +2,8 @@ import { beforeAll, describe, expect, test } from "bun:test" import { KernelAccountAbi, - KernelAccountClient, - KernelSmartAccount + type KernelAccountClient, + type KernelSmartAccount } from "@zerodev/sdk" import { Operation, @@ -15,15 +15,15 @@ import { serializeSessionKeyAccount, signerToSessionKeyValidator } from "@zerodev/session-key" -import { EntryPoint } from "permissionless/types/entrypoint.js" +import type { EntryPoint } from "permissionless/types/entrypoint.js" import { http, - Address, - Chain, - Hex, - PrivateKeyAccount, - PublicClient, - Transport, + type Address, + type Chain, + type Hex, + type PrivateKeyAccount, + type PublicClient, + type Transport, createPublicClient, encodeFunctionData, getAbiItem, diff --git a/packages/test/utils.ts b/packages/test/utils.ts index f0d46b9c..3159b504 100644 --- a/packages/test/utils.ts +++ b/packages/test/utils.ts @@ -1,11 +1,11 @@ import { signerToEcdsaValidator } from "@zerodev/ecdsa-validator" import { - KernelAccountClient, - KernelSmartAccount, + type KernelAccountClient, + type KernelSmartAccount, createKernelAccountClient, createZeroDevPaymasterClient } from "@zerodev/sdk" -import { KernelValidator, createKernelV1Account } from "@zerodev/sdk" +import { type KernelValidator, createKernelV1Account } from "@zerodev/sdk" import { addressToEmptyAccount, createKernelAccount @@ -14,7 +14,7 @@ import { createKernelV2Account } from "@zerodev/sdk/accounts" import type { Action } from "@zerodev/sdk/types" import { ParamOperator, - SessionKeyPlugin, + type SessionKeyPlugin, deserializeSessionKeyAccount, deserializeSessionKeyAccountV2, serializeSessionKeyAccount, @@ -23,7 +23,7 @@ import { import { createWeightedECDSAValidator } from "@zerodev/weighted-ecdsa-validator" import { getRecoveryAction } from "@zerodev/weighted-ecdsa-validator/constants.js" import { - BundlerClient, + type BundlerClient, ENTRYPOINT_ADDRESS_V06, createBundlerClient } from "permissionless" @@ -31,16 +31,16 @@ import { type SmartAccount, signerToSimpleSmartAccount } from "permissionless/accounts" -import { Middleware } from "permissionless/actions/smartAccount.js" -import { EntryPoint } from "permissionless/types/entrypoint.js" +import type { Middleware } from "permissionless/actions/smartAccount.js" +import type { EntryPoint } from "permissionless/types/entrypoint.js" import { http, - AbiItem, - Address, - Hex, + type AbiItem, + type Address, + type Hex, type Log, type PublicClient, - Transport, + type Transport, type WalletClient, createPublicClient, createWalletClient, @@ -54,7 +54,7 @@ import { } from "viem/accounts" import { type Chain, sepolia } from "viem/chains" import * as allChains from "viem/chains" -import { Policy } from "../../plugins/modularPermission/policies/types.js" +import type { Policy } from "../../plugins/modularPermission/policies/types.js" import { toECDSASigner } from "../../plugins/modularPermission/signers/toECDSASigner.js" import { createPermissionValidator } from "../../plugins/modularPermission/toModularPermissionValidatorPlugin.js" import { EntryPointAbi } from "./abis/EntryPoint.js" diff --git a/packages/test/v0.7/ecdsaKernelAccount.test.ts b/packages/test/v0.7/ecdsaKernelAccount.test.ts index 59e04e15..8d9ced33 100644 --- a/packages/test/v0.7/ecdsaKernelAccount.test.ts +++ b/packages/test/v0.7/ecdsaKernelAccount.test.ts @@ -9,8 +9,8 @@ import { constants, EIP1271Abi, KERNEL_ADDRESSES, - KernelAccountClient, - KernelSmartAccount, + type KernelAccountClient, + type KernelSmartAccount, createKernelAccount, getCustomNonceKeyFromString, verifyEIP6492Signature @@ -18,21 +18,21 @@ import { import dotenv from "dotenv" import { ethers } from "ethers" import { - BundlerClient, + type BundlerClient, ENTRYPOINT_ADDRESS_V07, bundlerActions } from "permissionless" import { SignTransactionNotSupportedBySmartAccount } from "permissionless/accounts" -import { PimlicoBundlerClient } from "permissionless/clients/pimlico.js" -import { EntryPoint } from "permissionless/types/entrypoint.js" +import type { PimlicoBundlerClient } from "permissionless/clients/pimlico.js" +import type { EntryPoint } from "permissionless/types/entrypoint.js" import { - Address, - Chain, - GetContractReturnType, - Hex, - PrivateKeyAccount, + type Address, + type Chain, + type GetContractReturnType, + type Hex, + type PrivateKeyAccount, type PublicClient, - Transport, + type Transport, decodeEventLog, encodeFunctionData, erc20Abi, diff --git a/packages/test/v0.7/permissionValidator.test.ts b/packages/test/v0.7/permissionValidator.test.ts index bb67e0a3..a6a4e045 100644 --- a/packages/test/v0.7/permissionValidator.test.ts +++ b/packages/test/v0.7/permissionValidator.test.ts @@ -3,21 +3,21 @@ import { beforeAll, describe, expect, test } from "bun:test" import { verifyMessage } from "@ambire/signature-validator" import { EIP1271Abi, - KernelAccountClient, - KernelSmartAccount, + type KernelAccountClient, + type KernelSmartAccount, verifyEIP6492Signature } from "@zerodev/sdk" import { ethers } from "ethers" -import { BundlerClient } from "permissionless" -import { PimlicoBundlerClient } from "permissionless/clients/pimlico" -import { EntryPoint } from "permissionless/types/entrypoint" +import type { BundlerClient } from "permissionless" +import type { PimlicoBundlerClient } from "permissionless/clients/pimlico" +import type { EntryPoint } from "permissionless/types/entrypoint" import { - Address, - Chain, - Hex, - PrivateKeyAccount, - PublicClient, - Transport, + type Address, + type Chain, + type Hex, + type PrivateKeyAccount, + type PublicClient, + type Transport, encodeFunctionData, getAbiItem, hashMessage, @@ -28,7 +28,7 @@ import { } from "viem" import { generatePrivateKey, privateKeyToAccount } from "viem/accounts" import { - Policy, + type Policy, deserializePermissionAccount, serializePermissionAccount } from "../../../plugins/permission" diff --git a/packages/test/v0.7/recoveryKernelAccount.test.ts b/packages/test/v0.7/recoveryKernelAccount.test.ts index 3ea35c24..203e9a77 100644 --- a/packages/test/v0.7/recoveryKernelAccount.test.ts +++ b/packages/test/v0.7/recoveryKernelAccount.test.ts @@ -1,16 +1,16 @@ // @ts-expect-error import { beforeAll, describe, expect, test } from "bun:test" import { ECDSA_VALIDATOR_ADDRESS_V07 } from "@zerodev/ecdsa-validator" -import { KernelAccountClient, KernelSmartAccount } from "@zerodev/sdk" +import type { KernelAccountClient, KernelSmartAccount } from "@zerodev/sdk" import dotenv from "dotenv" -import { BundlerClient, bundlerActions } from "permissionless" -import { EntryPoint } from "permissionless/types/entrypoint.js" +import { type BundlerClient, bundlerActions } from "permissionless" +import type { EntryPoint } from "permissionless/types/entrypoint.js" import { - Address, - Chain, - PrivateKeyAccount, + type Address, + type Chain, + type PrivateKeyAccount, type PublicClient, - Transport, + type Transport, decodeErrorResult, encodeFunctionData, parseAbi, diff --git a/packages/test/v0.7/remoteSigner.test.ts b/packages/test/v0.7/remoteSigner.test.ts index 185c2a41..508aff7c 100644 --- a/packages/test/v0.7/remoteSigner.test.ts +++ b/packages/test/v0.7/remoteSigner.test.ts @@ -3,19 +3,19 @@ import { beforeAll, describe, expect, test } from "bun:test" import { verifyMessage } from "@ambire/signature-validator" import { EIP1271Abi, - KernelAccountClient, - KernelSmartAccount, + type KernelAccountClient, + type KernelSmartAccount, verifyEIP6492Signature } from "@zerodev/sdk" import { ethers } from "ethers" -import { BundlerClient } from "permissionless" -import { PimlicoBundlerClient } from "permissionless/clients/pimlico" -import { EntryPoint } from "permissionless/types/entrypoint" +import type { BundlerClient } from "permissionless" +import type { PimlicoBundlerClient } from "permissionless/clients/pimlico" +import type { EntryPoint } from "permissionless/types/entrypoint" import { - Address, - Chain, - PublicClient, - Transport, + type Address, + type Chain, + type PublicClient, + type Transport, hashMessage, hashTypedData, zeroAddress diff --git a/packages/test/v0.7/utils.ts b/packages/test/v0.7/utils.ts index 48ea9821..d3516653 100644 --- a/packages/test/v0.7/utils.ts +++ b/packages/test/v0.7/utils.ts @@ -1,7 +1,7 @@ import { signerToEcdsaValidator } from "@zerodev/ecdsa-validator" import { - KernelAccountClient, - KernelSmartAccount, + type KernelAccountClient, + type KernelSmartAccount, createKernelAccount, createKernelAccountClient, createZeroDevPaymasterClient @@ -12,11 +12,11 @@ import { getRecoveryAction } from "@zerodev/weighted-ecdsa-validator" import { - BundlerClient, + type BundlerClient, ENTRYPOINT_ADDRESS_V07, createBundlerClient } from "permissionless" -import { Middleware } from "permissionless/actions/smartAccount" +import type { Middleware } from "permissionless/actions/smartAccount" import { createPimlicoBundlerClient, createPimlicoPaymasterClient @@ -24,14 +24,14 @@ import { import type { EntryPoint } from "permissionless/types/entrypoint" import { http, - Address, - Chain, - Hash, - Hex, - Log, - PrivateKeyAccount, - PublicClient, - Transport, + type Address, + type Chain, + type Hash, + type Hex, + type Log, + type PrivateKeyAccount, + type PublicClient, + type Transport, createPublicClient, decodeEventLog, encodeFunctionData, @@ -45,11 +45,11 @@ import * as allChains from "viem/chains" import { toECDSASigner } from "../../../plugins/permission/signers/toECDSASigner" import { toPermissionValidator } from "../../../plugins/permission/toPermissionValidator" -import { Policy } from "../../../plugins/permission/types" +import type { Policy } from "../../../plugins/permission/types" import { EntryPointAbi } from "../abis/EntryPoint" -import { Action } from "@zerodev/sdk/types/kernel.js" -import { SmartAccountSigner } from "permissionless/accounts/types.js" +import type { Action } from "@zerodev/sdk/types/kernel.js" +import type { SmartAccountSigner } from "permissionless/accounts/types.js" import { deserializePermissionAccount } from "../../../plugins/permission/deserializePermissionAccount.js" import { serializePermissionAccount } from "../../../plugins/permission/serializePermissionAccount.js" import { TEST_ERC20Abi } from "../abis/Test_ERC20Abi.js" diff --git a/packages/test/v0.7/weightedECDSAValidator.test.ts b/packages/test/v0.7/weightedECDSAValidator.test.ts index dac375f7..235ea0d8 100644 --- a/packages/test/v0.7/weightedECDSAValidator.test.ts +++ b/packages/test/v0.7/weightedECDSAValidator.test.ts @@ -1,10 +1,15 @@ // @ts-expect-error import { beforeAll, describe, expect, test } from "bun:test" -import { KernelAccountClient, KernelSmartAccount } from "@zerodev/sdk" -import { BundlerClient } from "permissionless" -import { PimlicoBundlerClient } from "permissionless/clients/pimlico" -import { EntryPoint } from "permissionless/types/entrypoint" -import { Chain, PublicClient, Transport, zeroAddress } from "viem" +import type { KernelAccountClient, KernelSmartAccount } from "@zerodev/sdk" +import type { BundlerClient } from "permissionless" +import type { PimlicoBundlerClient } from "permissionless/clients/pimlico" +import type { EntryPoint } from "permissionless/types/entrypoint" +import { + type Chain, + type PublicClient, + type Transport, + zeroAddress +} from "viem" import { getEntryPoint, getKernelAccountClient, diff --git a/packages/test/weightedEcdsaKernelAccount.test.ts b/packages/test/weightedEcdsaKernelAccount.test.ts index c7912beb..c2fb7532 100644 --- a/packages/test/weightedEcdsaKernelAccount.test.ts +++ b/packages/test/weightedEcdsaKernelAccount.test.ts @@ -2,14 +2,14 @@ import { beforeAll, describe, expect, test } from "bun:test" import { KERNEL_ADDRESSES, - KernelAccountClient, - KernelSmartAccount, + type KernelAccountClient, + type KernelSmartAccount, getCustomNonceKeyFromString } from "@zerodev/sdk" import { signerToSessionKeyValidator } from "@zerodev/session-key" import dotenv from "dotenv" import { - BundlerClient, + type BundlerClient, ENTRYPOINT_ADDRESS_V06, bundlerActions } from "permissionless" @@ -17,12 +17,12 @@ import { SignTransactionNotSupportedBySmartAccount, SmartAccount } from "permissionless/accounts" -import { EntryPoint } from "permissionless/types/entrypoint.js" +import type { EntryPoint } from "permissionless/types/entrypoint.js" import { - Address, - Chain, + type Address, + type Chain, type PublicClient, - Transport, + type Transport, encodeFunctionData, getContract, zeroAddress diff --git a/plugins/ecdsa/toECDSAValidatorPlugin.ts b/plugins/ecdsa/toECDSAValidatorPlugin.ts index 8f7afdb0..1952c3da 100644 --- a/plugins/ecdsa/toECDSAValidatorPlugin.ts +++ b/plugins/ecdsa/toECDSAValidatorPlugin.ts @@ -13,14 +13,14 @@ import type { EntryPoint, GetEntryPointVersion } from "permissionless/types/entrypoint" -import { - type Address, - type Chain, - type Client, - type Hex, - type LocalAccount, - type Transport, - type TypedDataDefinition +import type { + Address, + Chain, + Client, + Hex, + LocalAccount, + Transport, + TypedDataDefinition } from "viem" import { toAccount } from "viem/accounts" import { signMessage, signTypedData } from "viem/actions" diff --git a/plugins/modularPermission/deserializeModularPermissionAccount.ts b/plugins/modularPermission/deserializeModularPermissionAccount.ts index ea622162..113f57b2 100644 --- a/plugins/modularPermission/deserializeModularPermissionAccount.ts +++ b/plugins/modularPermission/deserializeModularPermissionAccount.ts @@ -12,7 +12,7 @@ import { toSignaturePolicy, toSudoPolicy } from "./policies/index.js" -import { type Policy } from "./policies/types.js" +import type { Policy } from "./policies/types.js" import { toECDSASigner } from "./signers/toECDSASigner.js" import type { ModularSigner } from "./signers/types.js" import { createPermissionValidator } from "./toModularPermissionValidatorPlugin.js" diff --git a/plugins/modularPermission/policies/types.ts b/plugins/modularPermission/policies/types.ts index 3a86c906..a797f9d2 100644 --- a/plugins/modularPermission/policies/types.ts +++ b/plugins/modularPermission/policies/types.ts @@ -1,11 +1,11 @@ -import { type UserOperation } from "permissionless" +import type { UserOperation } from "permissionless" import type { EntryPoint, GetEntryPointVersion } from "permissionless/types/entrypoint" import type { Abi, Address, Hex } from "viem" -import { PolicyFlags } from "../constants.js" -import { type Permission } from "../types.js" +import type { PolicyFlags } from "../constants.js" +import type { Permission } from "../types.js" export type PolicyParams = { policyAddress?: Address diff --git a/plugins/modularPermission/signers/toECDSASigner.ts b/plugins/modularPermission/signers/toECDSASigner.ts index 77a72c10..1f4891b6 100644 --- a/plugins/modularPermission/signers/toECDSASigner.ts +++ b/plugins/modularPermission/signers/toECDSASigner.ts @@ -4,7 +4,7 @@ import { SignTransactionNotSupportedBySmartAccount, type SmartAccountSigner } from "permissionless/accounts" -import { type Address, type LocalAccount, type TypedDataDefinition } from "viem" +import type { Address, LocalAccount, TypedDataDefinition } from "viem" import { toAccount } from "viem/accounts" import { ECDSA_SIGNER_CONTRACT } from "../constants.js" import type { ModularSigner, ModularSignerParams } from "./types.js" diff --git a/plugins/modularPermission/signers/toWebAuthnPubKey.ts b/plugins/modularPermission/signers/toWebAuthnPubKey.ts index dfc155a5..c24ab19c 100644 --- a/plugins/modularPermission/signers/toWebAuthnPubKey.ts +++ b/plugins/modularPermission/signers/toWebAuthnPubKey.ts @@ -1,5 +1,5 @@ import { Buffer } from "buffer" -import { type WebAuthnKey } from "./toWebAuthnSigner.js" +import type { WebAuthnKey } from "./toWebAuthnSigner.js" export enum WebAuthnMode { Register = "register", diff --git a/plugins/modularPermission/signers/types.ts b/plugins/modularPermission/signers/types.ts index 62329b31..239bf14f 100644 --- a/plugins/modularPermission/signers/types.ts +++ b/plugins/modularPermission/signers/types.ts @@ -1,4 +1,4 @@ -import { type Address, type Hex, type LocalAccount } from "viem" +import type { Address, Hex, LocalAccount } from "viem" export type ModularSignerParams = { signerContractAddress?: Address diff --git a/plugins/modularPermission/toModularPermissionValidatorPlugin.ts b/plugins/modularPermission/toModularPermissionValidatorPlugin.ts index c8e485b5..a11b30d4 100644 --- a/plugins/modularPermission/toModularPermissionValidatorPlugin.ts +++ b/plugins/modularPermission/toModularPermissionValidatorPlugin.ts @@ -18,11 +18,11 @@ import { getAction } from "viem/utils" import { ModularPermissionValidatorAbi } from "./abi/ModularPermissionValidatorAbi.js" import { MAX_FLAG, MODULAR_PERMISSION_VALIDATOR_ADDRESS } from "./constants.js" import type { Policy } from "./policies/types.js" -import { type ModularSigner } from "./signers/types.js" -import { - type ModularPermissionData, - type ModularPermissionPlugin, - type Nonces +import type { ModularSigner } from "./signers/types.js" +import type { + ModularPermissionData, + ModularPermissionPlugin, + Nonces } from "./types.js" export async function createPermissionValidator< diff --git a/plugins/modularPermission/types.ts b/plugins/modularPermission/types.ts index 6d84974b..63e7c51c 100644 --- a/plugins/modularPermission/types.ts +++ b/plugins/modularPermission/types.ts @@ -1,6 +1,6 @@ -import { type KernelValidator } from "@zerodev/sdk" +import type { KernelValidator } from "@zerodev/sdk" import type { Action, PluginValidityData } from "@zerodev/sdk/types" -import { type ExtractAbiFunction, type ExtractAbiFunctionNames } from "abitype" +import type { ExtractAbiFunction, ExtractAbiFunctionNames } from "abitype" import type { Pretty } from "abitype/src/types.js" import type { EntryPoint } from "permissionless/types/entrypoint" import type { @@ -14,7 +14,7 @@ import type { Hex, Narrow } from "viem" -import { Operation, ParamOperator } from "./policies/toMerklePolicy.js" +import type { Operation, ParamOperator } from "./policies/toMerklePolicy.js" import type { Policy } from "./policies/types.js" export interface ModularPermissionData { @@ -94,9 +94,9 @@ export type Permission< ? { abi?: Narrow } & GetFunctionArgs : _FunctionName extends string ? { abi?: [Narrow] } & GetFunctionArgs< - TAbi, - _FunctionName - > + TAbi, + _FunctionName + > : never) export type GetFunctionArgs< @@ -116,8 +116,8 @@ export type GetFunctionArgs< : TArgs extends readonly [] ? { args?: never } : { - args?: TArgs - } + args?: TArgs + } export type AbiParametersToPrimitiveTypes< TAbiParameters extends readonly AbiParameter[], diff --git a/plugins/permission/deserializePermissionAccount.ts b/plugins/permission/deserializePermissionAccount.ts index 836e65f8..a277a5a5 100644 --- a/plugins/permission/deserializePermissionAccount.ts +++ b/plugins/permission/deserializePermissionAccount.ts @@ -20,7 +20,7 @@ import { } from "./policies/index.js" import { toECDSASigner } from "./signers/toECDSASigner.js" import { toPermissionValidator } from "./toPermissionValidator.js" -import { type Policy } from "./types.js" +import type { Policy } from "./types.js" import type { ModularSigner } from "./types.js" import { deserializePermissionAccountParams } from "./utils.js" diff --git a/plugins/permission/policies/types.ts b/plugins/permission/policies/types.ts index 99a55b62..deefa31f 100644 --- a/plugins/permission/policies/types.ts +++ b/plugins/permission/policies/types.ts @@ -1,4 +1,4 @@ -import { type ExtractAbiFunction, type ExtractAbiFunctionNames } from "abitype" +import type { ExtractAbiFunction, ExtractAbiFunctionNames } from "abitype" import type { Abi, AbiFunction, @@ -73,8 +73,8 @@ export type GetFunctionArgs< : TArgs extends readonly [] ? { args?: never } : { - args?: TArgs - } + args?: TArgs + } export type Permission< TAbi extends Abi | readonly unknown[], @@ -88,9 +88,9 @@ export type Permission< ? { abi?: Narrow } & GetFunctionArgs : _FunctionName extends string ? { abi?: [Narrow] } & GetFunctionArgs< - TAbi, - _FunctionName - > + TAbi, + _FunctionName + > : never) export type CombinedArgs< diff --git a/plugins/permission/signers/toECDSASigner.ts b/plugins/permission/signers/toECDSASigner.ts index 6294becf..b1de49e6 100644 --- a/plugins/permission/signers/toECDSASigner.ts +++ b/plugins/permission/signers/toECDSASigner.ts @@ -4,7 +4,7 @@ import { SignTransactionNotSupportedBySmartAccount, type SmartAccountSigner } from "permissionless/accounts" -import { type Address, type LocalAccount, type TypedDataDefinition } from "viem" +import type { Address, LocalAccount, TypedDataDefinition } from "viem" import { toAccount } from "viem/accounts" import { ECDSA_SIGNER_CONTRACT } from "../constants.js" import type { ModularSigner, ModularSignerParams } from "../types.js" diff --git a/plugins/permission/signers/toEmptyECDSASigner.ts b/plugins/permission/signers/toEmptyECDSASigner.ts index 340015b0..8ae92b6e 100644 --- a/plugins/permission/signers/toEmptyECDSASigner.ts +++ b/plugins/permission/signers/toEmptyECDSASigner.ts @@ -1,6 +1,6 @@ import { constants } from "@zerodev/sdk" import type { TypedData } from "abitype" -import { type Address, type TypedDataDefinition } from "viem" +import type { Address, TypedDataDefinition } from "viem" import { toAccount } from "viem/accounts" import { ECDSA_SIGNER_CONTRACT } from "../constants.js" import type { ModularSigner } from "../types.js" diff --git a/plugins/permission/signers/toWebAuthnPubKey.ts b/plugins/permission/signers/toWebAuthnPubKey.ts index a995b615..a47aaa21 100644 --- a/plugins/permission/signers/toWebAuthnPubKey.ts +++ b/plugins/permission/signers/toWebAuthnPubKey.ts @@ -1,6 +1,6 @@ import { Buffer } from "buffer" import { type Hex, keccak256 } from "viem" -import { type WebAuthnKey } from "./toWebAuthnSigner.js" +import type { WebAuthnKey } from "./toWebAuthnSigner.js" import { b64ToBytes, uint8ArrayToHexString } from "./webAuthnUtils.js" export enum WebAuthnMode { diff --git a/plugins/permission/types.ts b/plugins/permission/types.ts index 3c76f04d..575c6b8d 100644 --- a/plugins/permission/types.ts +++ b/plugins/permission/types.ts @@ -1,8 +1,8 @@ -import { type KernelValidator } from "@zerodev/sdk" +import type { KernelValidator } from "@zerodev/sdk" import type { Action, PluginValidityData } from "@zerodev/sdk/types" import type { EntryPoint } from "permissionless/types/entrypoint" import type { Abi, Address, Hex, LocalAccount } from "viem" -import { PolicyFlags } from "./constants.js" +import type { PolicyFlags } from "./constants.js" import type { CallPolicyParams, GasPolicyParams, diff --git a/plugins/session-key/revokeSessionKey.ts b/plugins/session-key/revokeSessionKey.ts index d85a3f32..b6c8cabf 100644 --- a/plugins/session-key/revokeSessionKey.ts +++ b/plugins/session-key/revokeSessionKey.ts @@ -1,4 +1,4 @@ -import { type KernelAccountClient, type KernelSmartAccount } from "@zerodev/sdk" +import type { KernelAccountClient, KernelSmartAccount } from "@zerodev/sdk" import type { ENTRYPOINT_ADDRESS_V06_TYPE } from "permissionless/types/entrypoint" import { type Address, diff --git a/plugins/session-key/types.ts b/plugins/session-key/types.ts index e5b3dd87..61afbf75 100644 --- a/plugins/session-key/types.ts +++ b/plugins/session-key/types.ts @@ -1,23 +1,17 @@ import type { KernelValidator } from "@zerodev/sdk" import type { Action, PluginValidityData } from "@zerodev/sdk/types" -import { - type AbiFunction, - type AbiParameter, - type AbiParameterKind, - type AbiParameterToPrimitiveType, - type ExtractAbiFunction +import type { + AbiFunction, + AbiParameter, + AbiParameterKind, + AbiParameterToPrimitiveType, + ExtractAbiFunction } from "abitype" import type { ExtractAbiFunctionNames } from "abitype" import type { Pretty } from "abitype/src/types.js" import type { EntryPoint } from "permissionless/types/entrypoint" -import { - type Abi, - type AbiStateMutability, - type Address, - type Hex, - type Narrow -} from "viem" -import { Operation, ParamOperator } from "./toSessionKeyValidatorPlugin.js" +import type { Abi, AbiStateMutability, Address, Hex, Narrow } from "viem" +import type { Operation, ParamOperator } from "./toSessionKeyValidatorPlugin.js" export type SessionNonces = { lastNonce: bigint @@ -56,9 +50,9 @@ export type Permission< ? { abi?: Narrow } & GetFunctionArgs : _FunctionName extends string ? { abi?: [Narrow] } & GetFunctionArgs< - TAbi, - _FunctionName - > + TAbi, + _FunctionName + > : never) export interface SessionKeyData< @@ -125,8 +119,8 @@ export type GetFunctionArgs< : TArgs extends readonly [] ? { args?: never } : { - args?: TArgs - } + args?: TArgs + } export type GeneratePermissionFromArgsParameters< TAbi extends Abi | readonly unknown[], From d267467e9fcb12234936914c071e539803180b9d Mon Sep 17 00:00:00 2001 From: Sahil Vasava Date: Thu, 25 Apr 2024 14:02:27 +0530 Subject: [PATCH 3/3] chore: fix gh action to use frozen lockfile --- .github/actions/install-dependencies/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/install-dependencies/action.yml b/.github/actions/install-dependencies/action.yml index 388715b1..fd295879 100644 --- a/.github/actions/install-dependencies/action.yml +++ b/.github/actions/install-dependencies/action.yml @@ -12,4 +12,4 @@ runs: - name: Install dependencies shell: bash - run: bun install --ignore-scripts \ No newline at end of file + run: bun install --ignore-scripts --frozen-lockfile \ No newline at end of file