@getpara/aa-alchemy 2.16.0 → 2.17.0

package/dist/action.d.ts

@@ -1,5 +1,5 @@
 import { type SmartAccountClient } from '@aa-sdk/core';
-import type { SmartAccount4337, SmartAccount7702 } from '@getpara/viem-v2-integration';
+import type { SmartAccount4337, SmartAccount7702 } from '@getpara/viem-v2-integration/aa';
 import type { CreateAlchemySmartAccountParams } from './types.js';
 export type { CreateAlchemySmartAccountParams, AlchemyTransactionOptions } from './types.js';
 /**

package/dist/action.js

@@ -2,7 +2,16 @@ import { createModularAccountAlchemyClient, createModularAccountV2Client } from
 import * as alchemyInfra from "@account-kit/infra";
 import { WalletClientSigner } from "@aa-sdk/core";
 import { createParaAccount } from "@getpara/viem-v2-integration";
-import { SmartAccountError, wrapProviderError, resolveWalletIdentifier } from "@getpara/viem-v2-integration";
+import {
+  SmartAccountError,
+  wrapProviderError,
+  resolveWalletIdentifier,
+  ensureExternalWalletChain,
+  rejectExternalWallet7702,
+  assertAccountAddress,
+  isExternalWallet,
+  resolveExternalSigner
+} from "@getpara/viem-v2-integration/aa";
 import { createWalletClient, createPublicClient, http } from "viem";
 const ALCHEMY_7702_DELEGATION_ADDRESS = "0x69007702764179f14F51cdce752f4f775d74E139";
 const alchemyChainById = new Map(
@@ -19,14 +28,29 @@ function ensureAlchemyChain(chain) {
   });
 }
 async function createAlchemySmartAccount(params) {
-  const { para, apiKey, chain: rawChain, rpcUrl, gasPolicyId, mode = "4337" } = params;
-  const walletAddress = resolveWalletIdentifier(para, params);
-  if (!walletAddress) return null;
+  const { para, apiKey, chain: rawChain, rpcUrl, gasPolicyId, mode: rawMode = "4337" } = params;
+  const mode = rawMode;
+  if (mode === "7702") rejectExternalWallet7702(params.signer, "ALCHEMY");
   const chain = ensureAlchemyChain(rawChain);
-  const viemAccount = createParaAccount(para, walletAddress);
-  const viemClient = createWalletClient({ account: viemAccount, chain, transport: http(rpcUrl) });
   const publicClient = createPublicClient({ chain, transport: http(rpcUrl) });
-  const walletClientSigner = new WalletClientSigner(viemClient, "para");
+  let viemAccount;
+  let walletClientSigner;
+  if (params.signer) {
+    if (isExternalWallet(params.signer)) {
+      viemAccount = resolveExternalSigner(params.signer);
+      walletClientSigner = new WalletClientSigner(params.signer, "external");
+    } else {
+      viemAccount = params.signer;
+      const viemClient = createWalletClient({ account: viemAccount, chain, transport: http(rpcUrl) });
+      walletClientSigner = new WalletClientSigner(viemClient, "external");
+    }
+  } else {
+    const walletAddress = resolveWalletIdentifier(para, params);
+    if (!walletAddress) return null;
+    viemAccount = createParaAccount(para, walletAddress);
+    const viemClient = createWalletClient({ account: viemAccount, chain, transport: http(rpcUrl) });
+    walletClientSigner = new WalletClientSigner(viemClient, "para");
+  }
   let alchemyClient;
   if (mode === "7702") {
     alchemyClient = await createModularAccountV2Client({
@@ -44,15 +68,10 @@ async function createAlchemySmartAccount(params) {
       policyId: gasPolicyId
     });
   }
-  const accountAddress = alchemyClient.account?.address;
-  if (!accountAddress) {
-    throw new SmartAccountError({
-      code: "MISSING_ACCOUNT_ADDRESS",
-      message: "Unable to determine account address from Alchemy client",
-      provider: "ALCHEMY"
-    });
-  }
+  assertAccountAddress(alchemyClient.account?.address, "Alchemy client", "ALCHEMY");
+  const accountAddress = alchemyClient.account.address;
   const sendBatchTransaction = async (calls, txOptions) => {
+    await ensureExternalWalletChain(params.signer, chain, "ALCHEMY");
     const alchemyOptions = txOptions;
     if (!alchemyClient.sendUserOperation) {
       throw new SmartAccountError({

package/dist/types.d.ts

@@ -1,5 +1,5 @@
 import type { UserOperationOverrides } from '@aa-sdk/core';
-import type { ApiKeySmartAccountConfig, CreateSmartAccountParams, SmartAccountModeParam } from '@getpara/viem-v2-integration';
+import type { ApiKeySmartAccountConfig, CreateSmartAccountParams, SmartAccountModeParam } from '@getpara/viem-v2-integration/aa';
 /**
  * Configuration for Alchemy smart account.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpara/aa-alchemy",
-  "version": "2.16.0",
+  "version": "2.17.0",
   "description": "Alchemy smart account integration for Para",
   "type": "module",
   "main": "dist/index.js",
@@ -25,7 +25,7 @@
     "@aa-sdk/core": "^4.84.1",
     "@account-kit/infra": "^4.84.1",
     "@account-kit/smart-contracts": "^4.84.1",
-    "@getpara/viem-v2-integration": "2.16.0"
+    "@getpara/viem-v2-integration": "2.17.0"
   },
   "peerDependencies": {
     "viem": ">=2.0.0"
@@ -36,5 +36,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fbe96a062b308d04105213378c12c38ee973c798"
+  "gitHead": "3ed1f835b97ae720f1ac747611296e3b86f61138"
 }