feat: add support for thirdweb

zerodevapp · Sep 23, 2024 · 7d05abb · 7d05abb
1 parent 6795a9e
commit 7d05abb
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 19 deletions.
diff --git a/packages/core/actions/account-client/getUserOperationGasPrice.ts b/packages/core/actions/account-client/getUserOperationGasPrice.ts
@@ -12,15 +12,34 @@ export const getUserOperationGasPrice = async <
     TChain extends Chain | undefined = Chain | undefined,
     TAccount extends Account | undefined = Account | undefined
 >(
-    client: Client<TTransport, TChain, TAccount, ZeroDevAccountClientRpcSchema>
+    client: Client<TTransport, TChain, TAccount, ZeroDevAccountClientRpcSchema>,
+    provider: string
 ): Promise<Prettify<GetUserOperationGasPriceReturnType>> => {
-    const gasPrice = await client.request({
-        method: "zd_getUserOperationGasPrice",
-        params: []
-    })
+    if (provider === "PIMLICO") {
+        const gasPrice = await client.request({
+            method: "zd_getPimlicoUserOperationGasPrice",
+            params: []
+        })
 
-    return {
-        maxFeePerGas: BigInt(gasPrice.standard.maxFeePerGas),
-        maxPriorityFeePerGas: BigInt(gasPrice.standard.maxPriorityFeePerGas)
+        return {
+            maxFeePerGas: BigInt(gasPrice.standard.maxFeePerGas),
+            maxPriorityFeePerGas: BigInt(gasPrice.standard.maxPriorityFeePerGas)
+        }
     }
+
+    if (provider === "THIRDWEB") {
+        const gasPrice = await client.request({
+            method: "zd_getThirdwebUserOperationGasPrice",
+            params: []
+        })
+
+        return {
+            maxFeePerGas: BigInt(gasPrice.fast.maxFeePerGas),
+            maxPriorityFeePerGas: BigInt(gasPrice.fast.maxPriorityFeePerGas)
+        }
+    }
+
+    throw new Error(
+        `Unsupported provider: ${provider}, please use "PIMLICO" or "THIRDWEB"`
+    )
 }
diff --git a/packages/core/clients/kernelAccountClient.ts b/packages/core/clients/kernelAccountClient.ts
@@ -109,16 +109,21 @@ export const createKernelAccountClient = <
     })
 
     let middleware = parameters.middleware
-    if (
-        (!middleware ||
-            (typeof middleware !== "function" && !middleware.gasPrice)) &&
-        client.transport?.url &&
-        isProviderSet(client.transport.url, "PIMLICO")
-    ) {
-        const gasPrice = () => getUserOperationGasPrice(client)
-        middleware = {
-            ...middleware,
-            gasPrice
+    const providers = ["PIMLICO", "THIRDWEB"]
+
+    for (const provider of providers) {
+        if (
+            (!middleware ||
+                (typeof middleware !== "function" && !middleware.gasPrice)) &&
+            client.transport?.url &&
+            isProviderSet(client.transport.url, provider)
+        ) {
+            const gasPrice = () => getUserOperationGasPrice(client, provider)
+            middleware = {
+                ...middleware,
+                gasPrice
+            }
+            break
         }
     }
     return client.extend(

diff --git a/packages/core/types/kernel.ts b/packages/core/types/kernel.ts
@@ -110,7 +110,12 @@ export type ZeroDevUserOperationGasPriceWithBigIntAsHex = {
 
 export type ZeroDevAccountClientRpcSchema = [
     {
-        Method: "zd_getUserOperationGasPrice"
+        Method: "zd_getPimlicoUserOperationGasPrice"
+        Parameters: []
+        ReturnType: ZeroDevUserOperationGasPriceWithBigIntAsHex
+    },
+    {
+        Method: "zd_getThirdwebUserOperationGasPrice"
         Parameters: []
         ReturnType: ZeroDevUserOperationGasPriceWithBigIntAsHex
     }