permissionless 0.2.14 → 0.2.15

package/accounts/thirdweb/toThirdwebSmartAccount.ts

@@ -4,7 +4,6 @@ import type {
     Assign,
     Chain,
     Client,
-    EIP1193Provider,
     LocalAccount,
     OneOf,
     Transport,
@@ -25,7 +24,7 @@ import {
     toSmartAccount
 } from "viem/account-abstraction"
 import { getAction, toHex } from "viem/utils"
-import { toOwner } from "../../utils/toOwner"
+import { type EthereumProvider, toOwner } from "../../utils/toOwner"
 import { encodeCallData } from "./utils/encodeCallData"
 import { getAccountAddress } from "./utils/getAccountAddress"
 import { getFactoryData } from "./utils/getFactoryData"
@@ -49,7 +48,7 @@ export type ToThirdwebSmartAccountParameters<
 > = {
     client: Client
     owner: OneOf<
-        | EIP1193Provider
+        | EthereumProvider
         | WalletClient<Transport, Chain | undefined, Account>
         | LocalAccount
     >

package/accounts/trust/toTrustSmartAccount.ts

@@ -4,7 +4,6 @@ import {
     type Assign,
     type Chain,
     type Client,
-    type EIP1193Provider,
     type Hex,
     type LocalAccount,
     type OneOf,
@@ -27,7 +26,7 @@ import {
 } from "viem/account-abstraction"
 import { getAction } from "viem/utils"
 import { getSenderAddress } from "../../actions/public/getSenderAddress"
-import { toOwner } from "../../utils/toOwner"
+import { type EthereumProvider, toOwner } from "../../utils/toOwner"
 import { encodeCallData } from "./utils/encodeCallData"
 import { getFactoryData } from "./utils/getFactoryData"
 
@@ -69,7 +68,7 @@ export const TRUST_ADDRESSES: {
 export type ToTrustSmartAccountParameters = {
     client: Client
     owner: OneOf<
-        | EIP1193Provider
+        | EthereumProvider
         | WalletClient<Transport, Chain | undefined, Account>
         | LocalAccount
     >

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "permissionless",
-    "version": "0.2.14",
+    "version": "0.2.15",
     "author": "Pimlico",
     "homepage": "https://docs.pimlico.io/permissionless",
     "repository": "github:pimlicolabs/permissionless.js",

package/utils/toOwner.ts

@@ -2,9 +2,6 @@ import {
     type Account,
     type Address,
     type Chain,
-    type EIP1193Provider,
-    type EIP1193RequestFn,
-    type EIP1474Methods,
     type LocalAccount,
     type OneOf,
     type Transport,
@@ -17,12 +14,14 @@ import { toAccount } from "viem/accounts"
 import { signTypedData } from "viem/actions"
 import { getAction } from "viem/utils"
 
-export async function toOwner({
+export type EthereumProvider = { request(...args: any): Promise<any> }
+
+export async function toOwner<provider extends EthereumProvider>({
     owner,
     address
 }: {
     owner: OneOf<
-        | EIP1193Provider
+        | provider
         | WalletClient<Transport, Chain | undefined, Account>
         | LocalAccount
     >
@@ -39,15 +38,11 @@ export async function toOwner({
     if ("request" in owner) {
         if (!address) {
             try {
-                ;[address] = await (
-                    owner.request as EIP1193RequestFn<EIP1474Methods>
-                )({
+                ;[address] = await (owner as EthereumProvider).request({
                     method: "eth_requestAccounts"
                 })
             } catch {
-                ;[address] = await (
-                    owner.request as EIP1193RequestFn<EIP1474Methods>
-                )({
+                ;[address] = await (owner as EthereumProvider).request({
                     method: "eth_accounts"
                 })
             }
@@ -58,7 +53,7 @@ export async function toOwner({
         }
         walletClient = createWalletClient({
             account: address,
-            transport: custom(owner as EIP1193Provider)
+            transport: custom(owner as EthereumProvider)
         })
     }