@account-kit/infra 4.0.0-alpha.1 → 4.0.0-alpha.11

package/src/client/internal/smartAccountClientFromRpc.ts

@@ -39,8 +39,8 @@ export function getSignerTypeHeader<
  * Helper method meant to be used internally to create an alchemy smart account client
  * from an existing Alchemy Rpc Client
  *
- * @param args configuration for the client
- * @returns a smart account client configured to use Alchemy's RPC
+ * @param {CreateAlchemySmartAccountClientFromRpcClientParams<TAccount, TContext>} args configuration for the client
+ * @returns {AlchemySmartAccountClient} a smart account client configured to use Alchemy's RPC
  */
 export function createAlchemySmartAccountClientFromRpcClient<
   TChain extends Chain | undefined = Chain | undefined,
@@ -84,7 +84,7 @@ export function createAlchemySmartAccountClientFromRpcClient(
     opts,
     account,
     useSimulation,
-    gasManagerConfig,
+    policyId,
     feeEstimator,
     gasEstimator,
     customMiddleware,
@@ -106,7 +106,6 @@ export function createAlchemySmartAccountClientFromRpcClient(
       if (isSmartAccountWithSigner(args.account)) {
         client.updateHeaders(getSignerTypeHeader(args.account));
       }
-
       return customMiddleware ? customMiddleware(struct, args) : struct;
     },
     feeEstimator: feeEstimator ?? alchemyFeeEstimator(client),
@@ -114,22 +113,7 @@ export function createAlchemySmartAccountClientFromRpcClient(
       ? alchemyUserOperationSimulator(client)
       : undefined,
     gasEstimator,
-    ...(gasManagerConfig &&
-      alchemyGasManagerMiddleware(client, {
-        ...gasManagerConfig,
-        gasEstimationOptions: {
-          ...gasManagerConfig.gasEstimationOptions,
-          disableGasEstimation:
-            gasManagerConfig.gasEstimationOptions?.disableGasEstimation ??
-            false,
-          fallbackFeeDataGetter:
-            gasManagerConfig.gasEstimationOptions?.fallbackFeeDataGetter ??
-            feeEstimator,
-          fallbackGasEstimator:
-            gasManagerConfig.gasEstimationOptions?.fallbackGasEstimator ??
-            gasEstimator,
-        },
-      })),
+    ...(policyId && alchemyGasManagerMiddleware(policyId)),
     signUserOperation,
   }).extend(alchemyActions);
 

package/src/client/rpcClient.ts

@@ -14,7 +14,7 @@ import type { ClientWithAlchemyMethods } from "./types.js";
  * @example
  * ```ts
  * import { createAlchemyPublicRpcClient } from "@account-kit/infra";
- * import { sepolia } from "@account-kit/infra/chains";
+ * import { sepolia } from "@account-kit/infra";
  *
  * const client = createAlchemyPublicRpcClient({
  *  chain: sepolia,

package/src/client/smartAccountClient.ts

@@ -9,7 +9,6 @@ import {
 } from "@aa-sdk/core";
 import { type Chain, type Transport } from "viem";
 import { getDefaultUserOperationFeeOptions } from "../defaults.js";
-import { type AlchemyGasManagerConfig } from "../middleware/gasManager.js";
 import { AlchemyProviderConfigSchema } from "../schema.js";
 import type { AlchemyProviderConfig } from "../type.js";
 import type { AlchemySmartAccountClientActions } from "./decorators/smartAccount.js";
@@ -30,7 +29,7 @@ export type AlchemySmartAccountClientConfig<
 > = {
   account?: account;
   useSimulation?: boolean;
-  gasManagerConfig?: AlchemyGasManagerConfig;
+  policyId?: string;
 } & AlchemyProviderConfig &
   Pick<
     SmartAccountClientConfig<transport, chain, account, context>,
@@ -95,7 +94,7 @@ export function createAlchemySmartAccountClient<
     | undefined
 >({
   account,
-  gasManagerConfig,
+  policyId,
   useSimulation,
   feeEstimator,
   customMiddleware,
@@ -134,7 +133,7 @@ export function createAlchemySmartAccountClient<
  */
 export function createAlchemySmartAccountClient({
   account,
-  gasManagerConfig,
+  policyId,
   useSimulation,
   feeEstimator,
   customMiddleware,
@@ -160,7 +159,7 @@ export function createAlchemySmartAccountClient({
       ...opts,
       feeOptions,
     },
-    gasManagerConfig,
+    policyId,
     useSimulation,
     feeEstimator,
     customMiddleware,

package/src/client/types.ts

@@ -1,40 +1,11 @@
 import { type BundlerClient, type UserOperationRequest } from "@aa-sdk/core";
-import type { Address, Hex, HttpTransport } from "viem";
+import type { HttpTransport } from "viem";
 import type {
   SimulateUserOperationAssetChangesRequest,
   SimulateUserOperationAssetChangesResponse,
 } from "../actions/types";
-import type {
-  RequestGasAndPaymasterAndDataOverrides,
-  RequestGasAndPaymasterAndDataResponse,
-  RequestPaymasterAndDataResponse,
-} from "../middleware/gasManager";
 
 export type AlchemyRpcSchema = [
-  {
-    Method: "alchemy_requestPaymasterAndData";
-    Parameters: [
-      {
-        policyId: string;
-        entryPoint: Address;
-        userOperation: UserOperationRequest;
-      }
-    ];
-    ReturnType: RequestPaymasterAndDataResponse;
-  },
-  {
-    Method: "alchemy_requestGasAndPaymasterAndData";
-    Parameters: [
-      {
-        policyId: string;
-        entryPoint: Address;
-        userOperation: UserOperationRequest;
-        dummySignature: Hex;
-        overrides?: RequestGasAndPaymasterAndDataOverrides;
-      }
-    ];
-    ReturnType: RequestGasAndPaymasterAndDataResponse;
-  },
   {
     Method: "alchemy_simulateUserOperationAssetChanges";
     Parameters: SimulateUserOperationAssetChangesRequest;
@@ -50,30 +21,6 @@ export type AlchemyRpcSchema = [
 export type ClientWithAlchemyMethods = BundlerClient<HttpTransport> & {
   request: BundlerClient<HttpTransport>["request"] &
     {
-      request(args: {
-        method: "alchemy_requestPaymasterAndData";
-        params: [
-          {
-            policyId: string;
-            entryPoint: Address;
-            userOperation: UserOperationRequest;
-          }
-        ];
-      }): Promise<RequestPaymasterAndDataResponse>;
-
-      request(args: {
-        method: "alchemy_requestGasAndPaymasterAndData";
-        params: [
-          {
-            policyId: string;
-            entryPoint: Address;
-            userOperation: UserOperationRequest;
-            dummySignature: Hex;
-            overrides?: RequestGasAndPaymasterAndDataOverrides;
-          }
-        ];
-      }): Promise<RequestGasAndPaymasterAndDataResponse>;
-
       request(args: {
         method: "alchemy_simulateUserOperationAssetChanges";
         params: SimulateUserOperationAssetChangesRequest;

package/src/defaults.ts

@@ -1,3 +1,5 @@
+import { type UserOperationFeeOptions } from "@aa-sdk/core";
+import type { Chain } from "viem";
 import {
   arbitrum,
   arbitrumGoerli,
@@ -5,9 +7,7 @@ import {
   optimism,
   optimismGoerli,
   optimismSepolia,
-  type UserOperationFeeOptions,
-} from "@aa-sdk/core";
-import type { Chain } from "viem";
+} from "./chains.js";
 
 /**
  * Retrieves the default user operation fee options for a given chain. Adjusts fees for specific chains like Arbitrum and Optimism.
@@ -15,7 +15,7 @@ import type { Chain } from "viem";
  * @example
  * ```ts
  * import { getDefaultUserOperationFeeOptions } from "@account-kit/infra";
- * import { arbitrum } from "@account-kit/infra/chains";
+ * import { arbitrum } from "@account-kit/infra";
  *
  * const feeOpts = getDefaultUserOperationFeeOptions(arbitrum);
  * ```

package/src/gas-manager.ts

@@ -1,3 +1,4 @@
+import type { Address, Chain } from "viem";
 import {
   arbitrum,
   arbitrumSepolia,
@@ -14,8 +15,7 @@ import {
   sepolia,
   zora,
   zoraSepolia,
-} from "@aa-sdk/core";
-import type { Address, Chain } from "viem";
+} from "./chains.js";
 
 export const AlchemyPaymasterAddressV3 =
   "0x4f84a207A80c39E9e8BaE717c1F25bA7AD1fB08F";
@@ -31,7 +31,7 @@ export const AlchemyPaymasterAddressV1 =
  *
  * @example
  * ```ts
- * import { sepolia, getAlchemyPaymasterAddress } from "@account-kit/infra/chains";
+ * import { sepolia, getAlchemyPaymasterAddress } from "@account-kit/infra";
  *
  * const paymasterAddress = getAlchemyPaymasterAddress(sepolia);
  * ```

package/src/index.ts

@@ -2,7 +2,30 @@ export type * from "./actions/simulateUserOperationChanges.js";
 export { simulateUserOperationChanges } from "./actions/simulateUserOperationChanges.js";
 export type * from "./actions/types.js";
 export type * from "./chains.js";
-export { defineAlchemyChain } from "./chains.js";
+export {
+  arbitrum,
+  arbitrumGoerli,
+  arbitrumSepolia,
+  base,
+  baseGoerli,
+  baseSepolia,
+  defineAlchemyChain,
+  fraxtal,
+  fraxtalSepolia,
+  goerli,
+  mainnet,
+  optimism,
+  optimismGoerli,
+  optimismSepolia,
+  polygon,
+  polygonAmoy,
+  polygonMumbai,
+  sepolia,
+  zora,
+  zoraSepolia,
+  worldChain,
+  worldChainSepolia,
+} from "./chains.js";
 export type * from "./client/decorators/alchemyEnhancedApis.js";
 export { alchemyEnhancedApiActions } from "./client/decorators/alchemyEnhancedApis.js";
 export type * from "./client/decorators/smartAccount.js";