@account-kit/wallet-client 0.1.0-alpha.0 → 0.1.0-alpha.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (264) hide show
  1. package/dist/esm/abi/index.d.ts +8 -8
  2. package/dist/esm/abi/index.js +8 -8
  3. package/dist/esm/abi/index.js.map +1 -1
  4. package/dist/esm/client/actions/createAccount.d.ts +27 -2
  5. package/dist/esm/client/actions/createAccount.js +25 -0
  6. package/dist/esm/client/actions/createAccount.js.map +1 -1
  7. package/dist/esm/client/actions/formatSign.d.ts +28 -0
  8. package/dist/esm/client/actions/formatSign.js +30 -0
  9. package/dist/esm/client/actions/formatSign.js.map +1 -0
  10. package/dist/esm/client/actions/getCallsStatus.d.ts +22 -4
  11. package/dist/esm/client/actions/getCallsStatus.js +19 -0
  12. package/dist/esm/client/actions/getCallsStatus.js.map +1 -1
  13. package/dist/esm/client/actions/grantPermissions.d.ts +63 -6
  14. package/dist/esm/client/actions/grantPermissions.js +63 -3
  15. package/dist/esm/client/actions/grantPermissions.js.map +1 -1
  16. package/dist/esm/client/actions/listAccounts.d.ts +32 -4
  17. package/dist/esm/client/actions/listAccounts.js +35 -2
  18. package/dist/esm/client/actions/listAccounts.js.map +1 -1
  19. package/dist/esm/client/actions/prepareCalls.d.ts +32 -6
  20. package/dist/esm/client/actions/prepareCalls.js +39 -5
  21. package/dist/esm/client/actions/prepareCalls.js.map +1 -1
  22. package/dist/esm/client/actions/prepareSign.d.ts +25 -0
  23. package/dist/esm/client/actions/prepareSign.js +28 -0
  24. package/dist/esm/client/actions/prepareSign.js.map +1 -0
  25. package/dist/esm/client/actions/requestAccount.d.ts +25 -7
  26. package/dist/esm/client/actions/requestAccount.js +39 -8
  27. package/dist/esm/client/actions/requestAccount.js.map +1 -1
  28. package/dist/esm/client/actions/sendPreparedCalls.d.ts +33 -4
  29. package/dist/esm/client/actions/sendPreparedCalls.js +37 -1
  30. package/dist/esm/client/actions/sendPreparedCalls.js.map +1 -1
  31. package/dist/esm/client/actions/signMessage.d.ts +25 -5
  32. package/dist/esm/client/actions/signMessage.js +23 -3
  33. package/dist/esm/client/actions/signMessage.js.map +1 -1
  34. package/dist/esm/client/actions/signPreparedCalls.d.ts +14 -0
  35. package/dist/esm/client/actions/signPreparedCalls.js +43 -0
  36. package/dist/esm/client/actions/signPreparedCalls.js.map +1 -0
  37. package/dist/esm/client/actions/signSignatureRequest.d.ts +39 -5
  38. package/dist/esm/client/actions/signSignatureRequest.js +70 -12
  39. package/dist/esm/client/actions/signSignatureRequest.js.map +1 -1
  40. package/dist/esm/client/actions/signTypedData.d.ts +37 -4
  41. package/dist/esm/client/actions/signTypedData.js +35 -2
  42. package/dist/esm/client/actions/signTypedData.js.map +1 -1
  43. package/dist/esm/client/client.e2e-test.js +211 -46
  44. package/dist/esm/client/client.e2e-test.js.map +1 -1
  45. package/dist/esm/client/decorator.d.ts +19 -15
  46. package/dist/esm/client/decorator.js +13 -11
  47. package/dist/esm/client/decorator.js.map +1 -1
  48. package/dist/esm/client/index.d.ts +39 -13
  49. package/dist/esm/client/index.js +3 -6
  50. package/dist/esm/client/index.js.map +1 -1
  51. package/dist/esm/exports/index.d.ts +12 -13
  52. package/dist/esm/exports/index.js +12 -14
  53. package/dist/esm/exports/index.js.map +1 -1
  54. package/dist/esm/exports/internal.d.ts +4 -13
  55. package/dist/esm/exports/internal.js +2 -14
  56. package/dist/esm/exports/internal.js.map +1 -1
  57. package/dist/esm/internal/decorator.d.ts +2 -0
  58. package/dist/esm/internal/decorator.js +10 -0
  59. package/dist/esm/internal/decorator.js.map +1 -0
  60. package/dist/esm/isomorphic/actions/createSession.d.ts +2 -3
  61. package/dist/esm/isomorphic/actions/createSession.js +41 -12
  62. package/dist/esm/isomorphic/actions/createSession.js.map +1 -1
  63. package/dist/esm/isomorphic/actions/formatSign.d.ts +8 -0
  64. package/dist/esm/isomorphic/actions/formatSign.js +42 -0
  65. package/dist/esm/isomorphic/actions/formatSign.js.map +1 -0
  66. package/dist/esm/isomorphic/actions/getCallsStatus.d.ts +1 -15
  67. package/dist/esm/isomorphic/actions/getCallsStatus.js +39 -28
  68. package/dist/esm/isomorphic/actions/getCallsStatus.js.map +1 -1
  69. package/dist/esm/isomorphic/actions/prepareCalls.d.ts +1 -2
  70. package/dist/esm/isomorphic/actions/prepareCalls.js +80 -22
  71. package/dist/esm/isomorphic/actions/prepareCalls.js.map +1 -1
  72. package/dist/esm/isomorphic/actions/prepareSign.d.ts +7 -0
  73. package/dist/esm/isomorphic/actions/prepareSign.js +49 -0
  74. package/dist/esm/isomorphic/actions/prepareSign.js.map +1 -0
  75. package/dist/esm/isomorphic/actions/sendPreparedCalls.d.ts +3 -4
  76. package/dist/esm/isomorphic/actions/sendPreparedCalls.js +138 -25
  77. package/dist/esm/isomorphic/actions/sendPreparedCalls.js.map +1 -1
  78. package/dist/esm/isomorphic/client.d.ts +209 -32
  79. package/dist/esm/isomorphic/client.js +10 -6
  80. package/dist/esm/isomorphic/client.js.map +1 -1
  81. package/dist/esm/isomorphic/utils/7702.d.ts +19 -0
  82. package/dist/esm/isomorphic/utils/7702.js +70 -0
  83. package/dist/esm/isomorphic/utils/7702.js.map +1 -0
  84. package/dist/esm/isomorphic/utils/createAccount.d.ts +5 -4
  85. package/dist/esm/isomorphic/utils/createAccount.js +85 -11
  86. package/dist/esm/isomorphic/utils/createAccount.js.map +1 -1
  87. package/dist/esm/isomorphic/utils/createDummySigner.js +3 -3
  88. package/dist/esm/isomorphic/utils/createDummySigner.js.map +1 -1
  89. package/dist/esm/isomorphic/utils/decodeSignature.d.ts +3 -0
  90. package/dist/esm/isomorphic/utils/decodeSignature.js +15 -0
  91. package/dist/esm/isomorphic/utils/decodeSignature.js.map +1 -0
  92. package/dist/esm/isomorphic/utils/parsePermissionsContext.d.ts +6 -5
  93. package/dist/esm/isomorphic/utils/parsePermissionsContext.js +19 -6
  94. package/dist/esm/isomorphic/utils/parsePermissionsContext.js.map +1 -1
  95. package/dist/esm/isomorphic/utils/supportsFeature.d.ts +4 -0
  96. package/dist/esm/isomorphic/utils/supportsFeature.js +21 -0
  97. package/dist/esm/isomorphic/utils/supportsFeature.js.map +1 -0
  98. package/dist/esm/local/client.d.ts +3 -3
  99. package/dist/esm/local/client.js +14 -7
  100. package/dist/esm/local/client.js.map +1 -1
  101. package/dist/esm/remote/client.d.ts +9 -3
  102. package/dist/esm/remote/client.js +11 -12
  103. package/dist/esm/remote/client.js.map +1 -1
  104. package/dist/esm/types.d.ts +27 -13
  105. package/dist/esm/types.js.map +1 -1
  106. package/dist/esm/utils.d.ts +1 -0
  107. package/dist/esm/utils.js.map +1 -1
  108. package/dist/types/abi/index.d.ts +8 -8
  109. package/dist/types/abi/index.d.ts.map +1 -1
  110. package/dist/types/client/actions/createAccount.d.ts +27 -2
  111. package/dist/types/client/actions/createAccount.d.ts.map +1 -1
  112. package/dist/types/client/actions/formatSign.d.ts +29 -0
  113. package/dist/types/client/actions/formatSign.d.ts.map +1 -0
  114. package/dist/types/client/actions/getCallsStatus.d.ts +22 -4
  115. package/dist/types/client/actions/getCallsStatus.d.ts.map +1 -1
  116. package/dist/types/client/actions/grantPermissions.d.ts +63 -6
  117. package/dist/types/client/actions/grantPermissions.d.ts.map +1 -1
  118. package/dist/types/client/actions/listAccounts.d.ts +32 -4
  119. package/dist/types/client/actions/listAccounts.d.ts.map +1 -1
  120. package/dist/types/client/actions/prepareCalls.d.ts +32 -6
  121. package/dist/types/client/actions/prepareCalls.d.ts.map +1 -1
  122. package/dist/types/client/actions/prepareSign.d.ts +26 -0
  123. package/dist/types/client/actions/prepareSign.d.ts.map +1 -0
  124. package/dist/types/client/actions/requestAccount.d.ts +25 -7
  125. package/dist/types/client/actions/requestAccount.d.ts.map +1 -1
  126. package/dist/types/client/actions/sendPreparedCalls.d.ts +33 -4
  127. package/dist/types/client/actions/sendPreparedCalls.d.ts.map +1 -1
  128. package/dist/types/client/actions/signMessage.d.ts +25 -5
  129. package/dist/types/client/actions/signMessage.d.ts.map +1 -1
  130. package/dist/types/client/actions/signPreparedCalls.d.ts +15 -0
  131. package/dist/types/client/actions/signPreparedCalls.d.ts.map +1 -0
  132. package/dist/types/client/actions/signSignatureRequest.d.ts +39 -5
  133. package/dist/types/client/actions/signSignatureRequest.d.ts.map +1 -1
  134. package/dist/types/client/actions/signTypedData.d.ts +37 -4
  135. package/dist/types/client/actions/signTypedData.d.ts.map +1 -1
  136. package/dist/types/client/decorator.d.ts +19 -15
  137. package/dist/types/client/decorator.d.ts.map +1 -1
  138. package/dist/types/client/index.d.ts +39 -13
  139. package/dist/types/client/index.d.ts.map +1 -1
  140. package/dist/types/exports/index.d.ts +12 -13
  141. package/dist/types/exports/index.d.ts.map +1 -1
  142. package/dist/types/exports/internal.d.ts +4 -13
  143. package/dist/types/exports/internal.d.ts.map +1 -1
  144. package/dist/types/internal/decorator.d.ts +3 -0
  145. package/dist/types/internal/decorator.d.ts.map +1 -0
  146. package/dist/types/isomorphic/actions/createSession.d.ts +2 -3
  147. package/dist/types/isomorphic/actions/createSession.d.ts.map +1 -1
  148. package/dist/types/isomorphic/actions/formatSign.d.ts +9 -0
  149. package/dist/types/isomorphic/actions/formatSign.d.ts.map +1 -0
  150. package/dist/types/isomorphic/actions/getCallsStatus.d.ts +1 -15
  151. package/dist/types/isomorphic/actions/getCallsStatus.d.ts.map +1 -1
  152. package/dist/types/isomorphic/actions/prepareCalls.d.ts +1 -2
  153. package/dist/types/isomorphic/actions/prepareCalls.d.ts.map +1 -1
  154. package/dist/types/isomorphic/actions/prepareSign.d.ts +8 -0
  155. package/dist/types/isomorphic/actions/prepareSign.d.ts.map +1 -0
  156. package/dist/types/isomorphic/actions/sendPreparedCalls.d.ts +3 -4
  157. package/dist/types/isomorphic/actions/sendPreparedCalls.d.ts.map +1 -1
  158. package/dist/types/isomorphic/client.d.ts +209 -32
  159. package/dist/types/isomorphic/client.d.ts.map +1 -1
  160. package/dist/types/isomorphic/utils/7702.d.ts +20 -0
  161. package/dist/types/isomorphic/utils/7702.d.ts.map +1 -0
  162. package/dist/types/isomorphic/utils/createAccount.d.ts +5 -4
  163. package/dist/types/isomorphic/utils/createAccount.d.ts.map +1 -1
  164. package/dist/types/isomorphic/utils/createDummySigner.d.ts.map +1 -1
  165. package/dist/types/isomorphic/utils/decodeSignature.d.ts +4 -0
  166. package/dist/types/isomorphic/utils/decodeSignature.d.ts.map +1 -0
  167. package/dist/types/isomorphic/utils/parsePermissionsContext.d.ts +6 -5
  168. package/dist/types/isomorphic/utils/parsePermissionsContext.d.ts.map +1 -1
  169. package/dist/types/isomorphic/utils/supportsFeature.d.ts +5 -0
  170. package/dist/types/isomorphic/utils/supportsFeature.d.ts.map +1 -0
  171. package/dist/types/local/client.d.ts +3 -3
  172. package/dist/types/local/client.d.ts.map +1 -1
  173. package/dist/types/remote/client.d.ts +9 -3
  174. package/dist/types/remote/client.d.ts.map +1 -1
  175. package/dist/types/types.d.ts +27 -13
  176. package/dist/types/types.d.ts.map +1 -1
  177. package/dist/types/utils.d.ts +1 -0
  178. package/dist/types/utils.d.ts.map +1 -1
  179. package/package.json +15 -7
  180. package/src/abi/index.ts +8 -8
  181. package/src/client/actions/createAccount.ts +27 -2
  182. package/src/client/actions/formatSign.ts +53 -0
  183. package/src/client/actions/getCallsStatus.ts +21 -12
  184. package/src/client/actions/grantPermissions.ts +69 -26
  185. package/src/client/actions/listAccounts.ts +44 -6
  186. package/src/client/actions/prepareCalls.ts +46 -26
  187. package/src/client/actions/prepareSign.ts +46 -0
  188. package/src/client/actions/requestAccount.ts +62 -43
  189. package/src/client/actions/sendPreparedCalls.ts +44 -7
  190. package/src/client/actions/signMessage.ts +27 -22
  191. package/src/client/actions/signPreparedCalls.ts +67 -0
  192. package/src/client/actions/signSignatureRequest.ts +85 -21
  193. package/src/client/actions/signTypedData.ts +41 -20
  194. package/src/client/client.e2e-test.ts +257 -55
  195. package/src/client/decorator.ts +41 -39
  196. package/src/client/index.ts +55 -42
  197. package/src/exports/index.ts +13 -21
  198. package/src/exports/internal.ts +5 -13
  199. package/src/internal/decorator.ts +12 -0
  200. package/src/isomorphic/actions/createSession.ts +65 -22
  201. package/src/isomorphic/actions/formatSign.ts +76 -0
  202. package/src/isomorphic/actions/getCallsStatus.ts +49 -35
  203. package/src/isomorphic/actions/prepareCalls.ts +97 -25
  204. package/src/isomorphic/actions/prepareSign.ts +91 -0
  205. package/src/isomorphic/actions/sendPreparedCalls.ts +181 -42
  206. package/src/isomorphic/client.ts +17 -6
  207. package/src/isomorphic/utils/7702.ts +135 -0
  208. package/src/isomorphic/utils/createAccount.ts +102 -14
  209. package/src/isomorphic/utils/createDummySigner.ts +3 -2
  210. package/src/isomorphic/utils/decodeSignature.ts +21 -0
  211. package/src/isomorphic/utils/parsePermissionsContext.ts +29 -11
  212. package/src/isomorphic/utils/supportsFeature.ts +34 -0
  213. package/src/local/client.ts +61 -58
  214. package/src/remote/client.ts +20 -20
  215. package/src/types.ts +29 -23
  216. package/src/utils.ts +2 -0
  217. package/dist/esm/capabilities/index.d.ts +0 -31
  218. package/dist/esm/capabilities/index.js +0 -10
  219. package/dist/esm/capabilities/index.js.map +0 -1
  220. package/dist/esm/capabilities/overrides.d.ts +0 -26
  221. package/dist/esm/capabilities/overrides.js +0 -14
  222. package/dist/esm/capabilities/overrides.js.map +0 -1
  223. package/dist/esm/capabilities/paymaster.d.ts +0 -3
  224. package/dist/esm/capabilities/paymaster.js +0 -5
  225. package/dist/esm/capabilities/paymaster.js.map +0 -1
  226. package/dist/esm/capabilities/permissions/index.d.ts +0 -138
  227. package/dist/esm/capabilities/permissions/index.js +0 -71
  228. package/dist/esm/capabilities/permissions/index.js.map +0 -1
  229. package/dist/esm/capabilities/permissions/mav2.d.ts +0 -36
  230. package/dist/esm/capabilities/permissions/mav2.js +0 -79
  231. package/dist/esm/capabilities/permissions/mav2.js.map +0 -1
  232. package/dist/esm/rpc/request.d.ts +0 -352
  233. package/dist/esm/rpc/request.js +0 -204
  234. package/dist/esm/rpc/request.js.map +0 -1
  235. package/dist/esm/rpc/schema.d.ts +0 -342
  236. package/dist/esm/rpc/schema.js +0 -5
  237. package/dist/esm/rpc/schema.js.map +0 -1
  238. package/dist/esm/schemas.d.ts +0 -216
  239. package/dist/esm/schemas.js +0 -211
  240. package/dist/esm/schemas.js.map +0 -1
  241. package/dist/types/capabilities/index.d.ts +0 -32
  242. package/dist/types/capabilities/index.d.ts.map +0 -1
  243. package/dist/types/capabilities/overrides.d.ts +0 -27
  244. package/dist/types/capabilities/overrides.d.ts.map +0 -1
  245. package/dist/types/capabilities/paymaster.d.ts +0 -4
  246. package/dist/types/capabilities/paymaster.d.ts.map +0 -1
  247. package/dist/types/capabilities/permissions/index.d.ts +0 -139
  248. package/dist/types/capabilities/permissions/index.d.ts.map +0 -1
  249. package/dist/types/capabilities/permissions/mav2.d.ts +0 -37
  250. package/dist/types/capabilities/permissions/mav2.d.ts.map +0 -1
  251. package/dist/types/rpc/request.d.ts +0 -353
  252. package/dist/types/rpc/request.d.ts.map +0 -1
  253. package/dist/types/rpc/schema.d.ts +0 -343
  254. package/dist/types/rpc/schema.d.ts.map +0 -1
  255. package/dist/types/schemas.d.ts +0 -217
  256. package/dist/types/schemas.d.ts.map +0 -1
  257. package/src/capabilities/index.ts +0 -13
  258. package/src/capabilities/overrides.ts +0 -20
  259. package/src/capabilities/paymaster.ts +0 -5
  260. package/src/capabilities/permissions/index.ts +0 -142
  261. package/src/capabilities/permissions/mav2.ts +0 -127
  262. package/src/rpc/request.ts +0 -273
  263. package/src/rpc/schema.ts +0 -40
  264. package/src/schemas.ts +0 -257
@@ -1,22 +1,29 @@
1
1
  import type { SmartAccountSigner, SmartContractAccount } from "@aa-sdk/core";
2
2
  import {
3
+ createLightAccount,
3
4
  createModularAccountV2,
5
+ createMultiOwnerLightAccount,
6
+ createMultiOwnerModularAccount,
4
7
  type ModularAccountV2,
5
8
  } from "@account-kit/smart-contracts";
6
9
  import type { StaticDecode } from "@sinclair/typebox";
7
10
  import type { Address, Chain, Transport } from "viem";
8
11
  import { concatHex, hexToNumber } from "viem";
9
- import type { TypeSerializedInitcode } from "../../schemas";
10
- import type { Capabilities } from "../../capabilities";
11
- import { parsePermissionsContext } from "./parsePermissionsContext";
12
+ import { parsePermissionsContext } from "./parsePermissionsContext.js";
13
+ import { assertNever } from "../../utils.js";
14
+ import { getAccountTypeForDelegationAddress7702 } from "./7702.js";
15
+ import { TypeSerializedInitcode } from "@alchemy/wallet-api-types";
16
+ import { PermissionsCapability } from "@alchemy/wallet-api-types/capabilities";
17
+ import { InternalError, InvalidRequestError } from "ox/RpcResponse";
12
18
 
13
19
  type CreateAccountParams = {
14
20
  chain: Chain;
15
21
  transport: Transport;
16
22
  signer: SmartAccountSigner;
17
23
  accountAddress: Address;
18
- counterfactualInfo: StaticDecode<typeof TypeSerializedInitcode>;
19
- capabilities?: StaticDecode<typeof Capabilities>;
24
+ counterfactualInfo?: StaticDecode<typeof TypeSerializedInitcode>; // undefined for 7702 accounts
25
+ permissions?: StaticDecode<typeof PermissionsCapability>;
26
+ delegation?: Address;
20
27
  };
21
28
 
22
29
  /**
@@ -28,12 +35,14 @@ export async function createAccount(
28
35
  params: CreateAccountParams,
29
36
  ): Promise<SmartContractAccount> {
30
37
  const { counterfactualInfo: ci, ...accountParams } = params;
31
- // TODO: Implement support for other account types.
32
- if (ci.factoryType !== "MAv2.0.0-sma-b") {
33
- throw new Error("Only MAv2 SMA-B accounts are currently supported");
34
- }
35
38
 
36
- const parsedContext = parsePermissionsContext(params.capabilities, ci);
39
+ // This throws if we pass a permission context and the account is not MA-v2
40
+ // TODO: test that this edge case is handled correctly
41
+ const parsedContext = parsePermissionsContext(
42
+ params.permissions,
43
+ ci,
44
+ params.delegation,
45
+ );
37
46
 
38
47
  const signerEntity =
39
48
  parsedContext?.contextVersion === "NON_DEFERRED_ACTION"
@@ -43,12 +52,91 @@ export async function createAccount(
43
52
  }
44
53
  : undefined;
45
54
 
46
- return createModularAccountV2({
55
+ const mode = params.delegation ? "7702" : "default";
56
+
57
+ if (mode === "7702") {
58
+ const accountType = getAccountTypeForDelegationAddress7702(
59
+ params.delegation!,
60
+ );
61
+ if (accountType !== "ModularAccountV2") {
62
+ throw new Error("7702 mode currently only supports ModularAccountV2");
63
+ }
64
+ return createModularAccountV2({
65
+ ...accountParams,
66
+ signerEntity,
67
+ deferredAction: parsedContext?.deferredAction,
68
+ mode,
69
+ });
70
+ }
71
+
72
+ if (mode !== "default") {
73
+ return assertNever(mode, "Unexpected mode in createAccount");
74
+ }
75
+
76
+ // At this point, we are guaranteed to be in default mode, where ci
77
+ // (counterfactualInfo) must be defined
78
+
79
+ if (!ci) {
80
+ throw new InternalError({
81
+ message: "Counterfactual info not found",
82
+ });
83
+ }
84
+
85
+ const factoryType = ci.factoryType;
86
+ const commonParams = {
47
87
  ...accountParams,
48
- signerEntity,
49
- deferredAction: parsedContext?.deferredAction,
50
88
  initCode: concatHex([ci.factoryAddress, ci.factoryData]),
51
- });
89
+ };
90
+
91
+ // Return the account created based on the factory type
92
+ switch (factoryType) {
93
+ case "MAv2.0.0-sma-b":
94
+ return createModularAccountV2({
95
+ ...commonParams,
96
+ signerEntity,
97
+ deferredAction: parsedContext?.deferredAction,
98
+ mode,
99
+ });
100
+ case "LightAccountV2.0.0":
101
+ return createLightAccount({
102
+ ...commonParams,
103
+ version: "v2.0.0",
104
+ });
105
+ case "LightAccountV1.0.1":
106
+ return createLightAccount({
107
+ ...commonParams,
108
+ version: "v1.0.1",
109
+ });
110
+ case "LightAccountV1.0.2":
111
+ return createLightAccount({
112
+ ...commonParams,
113
+ version: "v1.0.2",
114
+ });
115
+ case "LightAccountV1.1.0":
116
+ return createLightAccount({
117
+ ...commonParams,
118
+ version: "v1.1.0",
119
+ });
120
+ case "MAv1.0.0-MultiOwner":
121
+ return createMultiOwnerModularAccount({
122
+ ...commonParams,
123
+ });
124
+ case "LightAccountV2.0.0-MultiOwner":
125
+ return createMultiOwnerLightAccount({
126
+ ...commonParams,
127
+ version: "v2.0.0",
128
+ });
129
+ case "MAv1.0.0-MultiSig":
130
+ case "MAv2.0.0-ma-ssv":
131
+ case "MAv2.0.0-ma-webauthn":
132
+ case "unknown":
133
+ case undefined:
134
+ throw new InvalidRequestError({
135
+ message: `Account type currently unsupported: ${factoryType}`,
136
+ });
137
+ default:
138
+ return assertNever(factoryType, "Unsupported factory type");
139
+ }
52
140
  }
53
141
 
54
142
  export function isModularAccountV2(
@@ -1,6 +1,7 @@
1
1
  import { type SmartAccountSigner } from "@aa-sdk/core";
2
2
  import type { TypedData } from "abitype";
3
3
  import {
4
+ BaseError,
4
5
  type Address,
5
6
  type Hex,
6
7
  type SignableMessage,
@@ -15,12 +16,12 @@ export const createDummySigner = (address: Address): SmartAccountSigner => ({
15
16
  },
16
17
  // Not supported on the server
17
18
  signMessage: function (_message: SignableMessage): Promise<Hex> {
18
- throw new Error("Function not implemented.");
19
+ throw new BaseError("signMessage not implemented by dummy signer.");
19
20
  },
20
21
  signTypedData: function <
21
22
  const TTypedData extends TypedData | Record<string, unknown>,
22
23
  TPrimaryType extends keyof TTypedData | "EIP712Domain" = keyof TTypedData,
23
24
  >(_params: TypedDataDefinition<TTypedData, TPrimaryType>): Promise<Hex> {
24
- throw new Error("Function not implemented.");
25
+ throw new BaseError("signTypedData not implemented by dummy signer.");
25
26
  },
26
27
  });
@@ -0,0 +1,21 @@
1
+ import { Value } from "@sinclair/typebox/value";
2
+ import type { StaticDecode } from "@sinclair/typebox";
3
+ import {
4
+ TypeEcdsaSig,
5
+ type TypeEcdsaSig as TypeEcdsaSigType,
6
+ } from "@alchemy/wallet-api-types";
7
+ import { assertNever } from "../../utils.js";
8
+
9
+ export const decodeSignature = (
10
+ signature: TypeEcdsaSigType["signature"],
11
+ ): StaticDecode<typeof TypeEcdsaSig>["signature"] => {
12
+ switch (signature.type) {
13
+ case "ecdsa":
14
+ case "secp256k1":
15
+ return Value.Decode(TypeEcdsaSig, {
16
+ signature,
17
+ } satisfies TypeEcdsaSigType).signature;
18
+ default:
19
+ return assertNever(signature, "Unexpected signature type");
20
+ }
21
+ };
@@ -1,27 +1,45 @@
1
1
  import type { StaticDecode } from "@sinclair/typebox";
2
- import type { PrepareCallsParams } from "../actions/prepareCalls";
3
- import type { TypeSerializedInitcode } from "../../schemas";
4
2
  import { InvalidRequestError } from "ox/RpcResponse";
5
- import { decodePermissionsContext } from "../../capabilities/permissions/mav2";
3
+ import type { Address } from "viem";
4
+ import { getAccountTypeForDelegationAddress7702 } from "./7702.js";
5
+ import {
6
+ decodePermissionsContext,
7
+ PermissionsCapability,
8
+ } from "@alchemy/wallet-api-types/capabilities";
9
+ import { TypeSerializedInitcode } from "@alchemy/wallet-api-types";
6
10
 
7
11
  export function parsePermissionsContext(
8
- capabilities: PrepareCallsParams["capabilities"],
9
- parsedCi: StaticDecode<typeof TypeSerializedInitcode>,
12
+ permissions?: StaticDecode<typeof PermissionsCapability>,
13
+ parsedCi?: StaticDecode<typeof TypeSerializedInitcode> | undefined,
14
+ delegation7702?: Address,
10
15
  ) {
11
- if (!capabilities?.permissions?.context) {
16
+ if (!permissions) {
12
17
  return undefined;
13
18
  }
14
19
 
15
- if (
16
- capabilities?.permissions?.context &&
17
- parsedCi.factoryType !== "MAv2.0.0-sma-b"
18
- ) {
20
+ if ("sessionId" in permissions) {
21
+ throw new InvalidRequestError({
22
+ message: "Remote permissions are not supported in isomorphic client",
23
+ });
24
+ }
25
+
26
+ if (!("context" in permissions)) {
27
+ return undefined;
28
+ }
29
+
30
+ const isMAV2 =
31
+ (parsedCi && parsedCi.factoryType === "MAv2.0.0-sma-b") ||
32
+ (delegation7702 &&
33
+ getAccountTypeForDelegationAddress7702(delegation7702) ===
34
+ "ModularAccountV2");
35
+
36
+ if (!isMAV2) {
19
37
  throw new InvalidRequestError({
20
38
  message: "Permissions are currently only supported by MAv2 accounts",
21
39
  });
22
40
  }
23
41
 
24
- const context = decodePermissionsContext(capabilities.permissions.context);
42
+ const context = decodePermissionsContext(permissions);
25
43
 
26
44
  if (context?.contextVersion === "REMOTE_MODE_DEFERRED_ACTION") {
27
45
  throw new InvalidRequestError({
@@ -0,0 +1,34 @@
1
+ import type { StaticDecode } from "@sinclair/typebox";
2
+ import type { TypeSerializedInitcode } from "@alchemy/wallet-api-types";
3
+
4
+ export type Feature = "permissions";
5
+
6
+ type FactoryType = StaticDecode<typeof TypeSerializedInitcode>["factoryType"];
7
+
8
+ const supportedFeatures: Record<FactoryType, Feature[]> = {
9
+ "LightAccountV1.0.1": [],
10
+ "LightAccountV1.0.2": [],
11
+ "LightAccountV1.1.0": [],
12
+ "LightAccountV2.0.0": [],
13
+ "LightAccountV2.0.0-MultiOwner": [],
14
+ "MAv1.0.0-MultiOwner": [],
15
+ "MAv1.0.0-MultiSig": [],
16
+ "MAv2.0.0-sma-b": ["permissions"],
17
+ "MAv2.0.0-ma-ssv": ["permissions"],
18
+ "MAv2.0.0-ma-webauthn": [],
19
+ unknown: [],
20
+ };
21
+
22
+ export function supportsFeature(
23
+ counterfactualInfo: StaticDecode<typeof TypeSerializedInitcode>,
24
+ feature: Feature,
25
+ ): boolean {
26
+ const factorySupportedFeatures =
27
+ supportedFeatures[counterfactualInfo.factoryType];
28
+ if (factorySupportedFeatures === undefined) {
29
+ throw new Error(
30
+ "Unsupported FactoryType: " + counterfactualInfo.factoryType,
31
+ );
32
+ }
33
+ return factorySupportedFeatures.includes(feature);
34
+ }
@@ -1,22 +1,23 @@
1
1
  import { split } from "@aa-sdk/core";
2
2
  import { buildDeferredActionDigest } from "@account-kit/smart-contracts/experimental";
3
- import { createClient, custom, type Address, type JsonRpcAccount } from "viem";
3
+ import { createClient, custom, type Address } from "viem";
4
4
  import {
5
5
  encodePermissionsContext,
6
6
  prefixSignatureKeyType,
7
- } from "../capabilities/permissions/mav2";
8
- import { signSignatureRequest } from "../client/actions/signSignatureRequest";
9
- import type { PrepareCallsParams } from "../isomorphic/actions/prepareCalls";
7
+ } from "@alchemy/wallet-api-types/capabilities";
8
+ import { signSignatureRequest } from "../client/actions/signSignatureRequest.js";
9
+ import { internalStateDecorator } from "../internal/decorator.js";
10
+ import type { PrepareCallsParams } from "../isomorphic/actions/prepareCalls.ts";
10
11
  import {
11
12
  createIsomorphicClient,
12
13
  type IsomorphicClient,
13
- } from "../isomorphic/client";
14
+ } from "../isomorphic/client.js";
14
15
  import type {
15
16
  CreateInnerClientParams,
16
17
  InnerClientActions,
17
18
  InnerWalletApiClient,
18
- } from "../types";
19
- import { assertNever } from "../utils";
19
+ } from "../types.ts";
20
+ import { assertNever } from "../utils.js";
20
21
 
21
22
  const localMethods = [
22
23
  "wallet_prepareCalls",
@@ -27,10 +28,8 @@ const localMethods = [
27
28
  type LocalMethod = (typeof localMethods)[number];
28
29
 
29
30
  export function createLocalClient<
30
- TAccount extends JsonRpcAccount<Address> | undefined =
31
- | JsonRpcAccount<Address>
32
- | undefined,
33
- >(params: CreateInnerClientParams<TAccount>): InnerWalletApiClient<TAccount>;
31
+ TAccount extends Address | undefined = Address | undefined,
32
+ >(params: CreateInnerClientParams<TAccount>): InnerWalletApiClient;
34
33
 
35
34
  export function createLocalClient(
36
35
  params: CreateInnerClientParams,
@@ -51,46 +50,51 @@ export function createLocalClient(
51
50
  overrides: [
52
51
  {
53
52
  methods: localMethods,
54
- transport: custom({
55
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
56
- async request(args: { method: LocalMethod; params: any }) {
57
- switch (args.method) {
58
- case "wallet_prepareCalls": {
59
- const params = args.params[0] as PrepareCallsParams;
60
- const capabilityPolicyId =
61
- params.capabilities?.paymasterService?.policyId;
53
+ transport: custom(
54
+ {
55
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
56
+ async request(args: { method: LocalMethod; params: any }) {
57
+ switch (args.method) {
58
+ case "wallet_prepareCalls": {
59
+ const params = args.params[0] as PrepareCallsParams;
60
+ const capabilityPolicyId =
61
+ params.capabilities?.paymasterService?.policyId;
62
62
 
63
- if (
64
- capabilityPolicyId != null &&
65
- policyId !== capabilityPolicyId &&
66
- !clientMap[capabilityPolicyId]
67
- ) {
68
- clientMap[capabilityPolicyId] = createIsomorphicClient({
69
- transport,
70
- chain,
71
- policyId: capabilityPolicyId,
72
- });
73
- }
63
+ if (
64
+ capabilityPolicyId != null &&
65
+ policyId !== capabilityPolicyId &&
66
+ !clientMap[capabilityPolicyId]
67
+ ) {
68
+ clientMap[capabilityPolicyId] = createIsomorphicClient({
69
+ transport,
70
+ chain,
71
+ policyId: capabilityPolicyId,
72
+ });
73
+ }
74
74
 
75
- const client =
76
- clientMap[capabilityPolicyId ?? policyId ?? "default"];
77
- return client.prepareCalls(params);
78
- }
79
- case "wallet_sendPreparedCalls":
80
- return isomorphicClient.sendPreparedCalls(args.params[0]);
81
- case "wallet_getCallsStatus":
82
- return isomorphicClient.getCallsStatus(args.params[0]);
83
- case "wallet_createSession": {
84
- return isomorphicClient.createSession(args.params[0]);
75
+ const client =
76
+ clientMap[capabilityPolicyId ?? policyId ?? "default"];
77
+ return client.prepareCalls(params);
78
+ }
79
+ case "wallet_sendPreparedCalls":
80
+ return isomorphicClient.sendPreparedCalls(args.params[0]);
81
+ case "wallet_getCallsStatus":
82
+ return isomorphicClient.getCallsStatus(args.params[0]);
83
+ case "wallet_createSession": {
84
+ return isomorphicClient.createSession(args.params[0]);
85
+ }
86
+ default:
87
+ return assertNever(
88
+ args.method,
89
+ `Unexpected method: ${args.method}`,
90
+ );
85
91
  }
86
- default:
87
- return assertNever(
88
- args.method,
89
- `Unexpected method: ${args.method}`,
90
- );
91
- }
92
+ },
92
93
  },
93
- }),
94
+ {
95
+ retryCount: 0,
96
+ },
97
+ ),
94
98
  },
95
99
  ],
96
100
  fallback: transport,
@@ -100,10 +104,14 @@ export function createLocalClient(
100
104
  transport: innerTransport,
101
105
  chain,
102
106
  account,
103
- }).extend(() => ({
104
- policyId,
105
- ...innerClientActions(isomorphicClient),
106
- }));
107
+ })
108
+ .extend(() => ({
109
+ policyId,
110
+ ...innerClientActions(isomorphicClient),
111
+ }))
112
+ .extend(() => ({
113
+ internal: internalStateDecorator(),
114
+ }));
107
115
  }
108
116
 
109
117
  const innerClientActions = (
@@ -113,18 +121,13 @@ const innerClientActions = (
113
121
  grantPermissions: async (signer, params) => {
114
122
  const { signatureRequest, fullPreSignatureDeferredActionDigest } =
115
123
  await isomorphicClient.createSession(params);
116
-
117
- const { signature } = await signSignatureRequest(
118
- signer,
119
- signatureRequest,
120
- );
121
-
124
+ const signature = await signSignatureRequest(signer, signatureRequest);
122
125
  return {
123
126
  context: encodePermissionsContext({
124
127
  contextVersion: "LOCAL_MODE_DEFERRED_ACTION",
125
128
  deferredAction: buildDeferredActionDigest({
126
129
  fullPreSignatureDeferredActionDigest,
127
- sig: prefixSignatureKeyType(signature, "secp256k1"),
130
+ sig: prefixSignatureKeyType(signature.data, signature.type),
128
131
  }),
129
132
  }),
130
133
  };
@@ -1,20 +1,15 @@
1
1
  import { Provider } from "ox";
2
- import { createClient, custom, type Address, type JsonRpcAccount } from "viem";
3
- import { WalletServerRpcSchema } from "../rpc/schema";
2
+ import { createClient, custom, type Address } from "viem";
3
+ import { encodePermissionsContext } from "@alchemy/wallet-api-types/capabilities";
4
+ import { WalletServerRpcSchema } from "@alchemy/wallet-api-types/rpc";
5
+ import { signSignatureRequest } from "../client/actions/signSignatureRequest.js";
6
+ import { internalStateDecorator } from "../internal/decorator.js";
4
7
  import type {
5
8
  CreateInnerClientParams,
6
9
  InnerClientActions,
7
10
  InnerWalletApiClient,
8
11
  InnerWalletApiClientBase,
9
- } from "../types";
10
- import { signSignatureRequest } from "../client/actions/signSignatureRequest";
11
- import { encodePermissionsContext } from "../capabilities/permissions/mav2";
12
-
13
- export function createRemoteClient<
14
- TAccount extends JsonRpcAccount<Address> | undefined =
15
- | JsonRpcAccount<Address>
16
- | undefined,
17
- >(params: CreateInnerClientParams<TAccount>): InnerWalletApiClient<TAccount>;
12
+ } from "../types.ts";
18
13
 
19
14
  /**
20
15
  * This is a low-level client just used to make RPC requests in remote mode
@@ -22,6 +17,10 @@ export function createRemoteClient<
22
17
  * that uses this client under the hood
23
18
  * @returns
24
19
  */
20
+ export function createRemoteClient<
21
+ TAccount extends Address | undefined = Address | undefined,
22
+ >(params: CreateInnerClientParams<TAccount>): InnerWalletApiClient;
23
+
25
24
  export function createRemoteClient(
26
25
  params: CreateInnerClientParams,
27
26
  ): InnerWalletApiClient {
@@ -34,10 +33,14 @@ export function createRemoteClient(
34
33
  ),
35
34
  chain,
36
35
  account,
37
- }).extend((_client) => ({
38
- policyId: params.policyId,
39
- ...innerClientActions(_client),
40
- }));
36
+ })
37
+ .extend((_client) => ({
38
+ policyId: params.policyId,
39
+ ...innerClientActions(_client),
40
+ }))
41
+ .extend(() => ({
42
+ internal: internalStateDecorator(),
43
+ }));
41
44
 
42
45
  return client;
43
46
  }
@@ -51,15 +54,12 @@ const innerClientActions = (
51
54
  method: "wallet_createSession",
52
55
  params: [params],
53
56
  });
54
- const { signature } = await signSignatureRequest(
55
- signer,
56
- signatureRequest,
57
- );
57
+ const signature = await signSignatureRequest(signer, signatureRequest);
58
58
  return {
59
59
  context: encodePermissionsContext({
60
60
  contextVersion: "REMOTE_MODE_DEFERRED_ACTION",
61
61
  sessionId,
62
- signature,
62
+ signature: signature.data,
63
63
  }),
64
64
  };
65
65
  },
package/src/types.ts CHANGED
@@ -1,47 +1,37 @@
1
+ import type { SmartAccountSigner, SmartContractAccount } from "@aa-sdk/core";
1
2
  import type { AlchemyTransport } from "@account-kit/infra";
2
3
  import type {
3
4
  Address,
4
5
  Chain,
5
6
  Client,
6
7
  Hex,
7
- IsUndefined,
8
8
  JsonRpcAccount,
9
9
  Transport,
10
10
  } from "viem";
11
- import type { WalletServerViemRpcSchema } from "./rpc/schema";
12
- import type { SmartAccountSigner } from "@aa-sdk/core";
13
11
  import type {
14
12
  GrantPermissionsParams,
15
13
  GrantPermissionsResult,
16
- } from "./client/actions/grantPermissions";
14
+ } from "./client/actions/grantPermissions.ts";
15
+ import type { RequestAccountParams } from "./client/actions/requestAccount.ts";
16
+ import type { WalletServerViemRpcSchema } from "@alchemy/wallet-api-types/rpc";
17
17
 
18
18
  export type CreateInnerClientParams<
19
- TAccount extends JsonRpcAccount<Address> | undefined =
20
- | JsonRpcAccount<Address>
21
- | undefined,
19
+ TAccount extends Address | undefined = Address | undefined,
22
20
  > = {
23
21
  chain: Chain;
24
22
  transport: AlchemyTransport;
25
23
  policyId?: string;
26
- } & (IsUndefined<TAccount> extends true
27
- ? {
28
- account?: never;
29
- }
30
- : {
31
- account: Address;
32
- });
24
+ account?: TAccount | Address | undefined;
25
+ };
33
26
 
34
27
  export type InnerWalletApiClientBase<
35
- TAccount extends JsonRpcAccount<Address> | undefined =
36
- | JsonRpcAccount<Address>
37
- | undefined,
38
28
  TExtend extends { [key: string]: unknown } | undefined =
39
29
  | { [key: string]: unknown }
40
30
  | undefined,
41
31
  > = Client<
42
32
  Transport,
43
33
  Chain,
44
- TAccount,
34
+ JsonRpcAccount<Address> | undefined,
45
35
  WalletServerViemRpcSchema,
46
36
  { policyId?: string } & TExtend
47
37
  >;
@@ -53,8 +43,24 @@ export type InnerClientActions = {
53
43
  ) => Promise<GrantPermissionsResult>;
54
44
  };
55
45
 
56
- export type InnerWalletApiClient<
57
- TAccount extends JsonRpcAccount<Address> | undefined =
58
- | JsonRpcAccount<Address>
59
- | undefined,
60
- > = InnerWalletApiClientBase<TAccount, InnerClientActions>;
46
+ export type CachedAccount = {
47
+ account: SmartContractAccount;
48
+ requestParams: RequestAccountParams;
49
+ };
50
+
51
+ export type InternalState = {
52
+ setAccount: (account: CachedAccount) => void;
53
+ getAccount: () => CachedAccount | undefined;
54
+ };
55
+
56
+ export type InnerWalletApiClient = InnerWalletApiClientBase<
57
+ InnerClientActions & { internal: InternalState }
58
+ >;
59
+
60
+ export type WithoutChainId<T> = T extends { chainId: Hex }
61
+ ? Omit<T, "chainId">
62
+ : T;
63
+
64
+ export type WithoutRawPayload<T> = T extends { rawPayload: Hex }
65
+ ? Omit<T, "rawPayload">
66
+ : T;
package/src/utils.ts CHANGED
@@ -1,5 +1,7 @@
1
1
  import { isHex, toHex, type Hex } from "viem";
2
2
 
3
+ export type Expect<T extends true> = T;
4
+
3
5
  export const assertNever = (_val: never, msg: string): never => {
4
6
  throw new Error(msg);
5
7
  };
@@ -1,31 +0,0 @@
1
- export declare const Capabilities: import("@sinclair/typebox").TObject<{
2
- permissions: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
3
- context: import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">;
4
- }>>;
5
- paymasterService: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
6
- policyId: import("@sinclair/typebox").TString;
7
- }>>;
8
- gasParamsOverride: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
9
- preVerificationGas: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">, import("@sinclair/typebox").TObject<{
10
- multiplier: import("@sinclair/typebox").TNumber;
11
- }>]>>;
12
- verificationGasLimit: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">, import("@sinclair/typebox").TObject<{
13
- multiplier: import("@sinclair/typebox").TNumber;
14
- }>]>>;
15
- callGasLimit: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">, import("@sinclair/typebox").TObject<{
16
- multiplier: import("@sinclair/typebox").TNumber;
17
- }>]>>;
18
- paymasterVerificationGasLimit: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">, import("@sinclair/typebox").TObject<{
19
- multiplier: import("@sinclair/typebox").TNumber;
20
- }>]>>;
21
- paymasterPostOpGasLimit: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">, import("@sinclair/typebox").TObject<{
22
- multiplier: import("@sinclair/typebox").TNumber;
23
- }>]>>;
24
- maxFeePerGas: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">, import("@sinclair/typebox").TObject<{
25
- multiplier: import("@sinclair/typebox").TNumber;
26
- }>]>>;
27
- maxPriorityFeePerGas: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TTemplateLiteralSyntax<"0x${string}">, import("@sinclair/typebox").TObject<{
28
- multiplier: import("@sinclair/typebox").TNumber;
29
- }>]>>;
30
- }>>;
31
- }>;
@@ -1,10 +0,0 @@
1
- import { Type } from "@sinclair/typebox";
2
- import { GasParamsOverrideCapability } from "./overrides";
3
- import { PaymasterCapability } from "./paymaster";
4
- import { PermissionsCapability } from "./permissions";
5
- export const Capabilities = Type.Object({
6
- permissions: Type.Optional(PermissionsCapability),
7
- paymasterService: Type.Optional(PaymasterCapability),
8
- gasParamsOverride: Type.Optional(GasParamsOverrideCapability),
9
- }, { minProperties: 1 });
10
- //# sourceMappingURL=index.js.map