thirdweb 5.48.2 → 5.48.3-nightly-a8e2bc58c9e8fe5b75d6c27d406e6b80d5d067e2-20240828000339

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 (176) hide show
  1. package/dist/cjs/exports/wallets/smart.js +4 -2
  2. package/dist/cjs/exports/wallets/smart.js.map +1 -1
  3. package/dist/cjs/extensions/erc1155/drops/write/claimTo.js.map +1 -1
  4. package/dist/cjs/extensions/erc4337/__generated__/IEntryPoint_v07/events/PostOpRevertReason.js +32 -0
  5. package/dist/cjs/extensions/erc4337/__generated__/IEntryPoint_v07/events/PostOpRevertReason.js.map +1 -0
  6. package/dist/cjs/extensions/erc4337/__generated__/IEntryPoint_v07/read/getUserOpHash.js +153 -0
  7. package/dist/cjs/extensions/erc4337/__generated__/IEntryPoint_v07/read/getUserOpHash.js.map +1 -0
  8. package/dist/cjs/extensions/prebuilts/__generated__/VoteERC20/write/initialize.js +184 -0
  9. package/dist/cjs/extensions/prebuilts/__generated__/VoteERC20/write/initialize.js.map +1 -0
  10. package/dist/cjs/extensions/prebuilts/deploy-vote.js +122 -0
  11. package/dist/cjs/extensions/prebuilts/deploy-vote.js.map +1 -0
  12. package/dist/cjs/react/core/hooks/pay/useBuyWithCryptoQuote.js +5 -1
  13. package/dist/cjs/react/core/hooks/pay/useBuyWithCryptoQuote.js.map +1 -1
  14. package/dist/cjs/react/core/hooks/pay/useBuyWithFiatQuote.js +5 -1
  15. package/dist/cjs/react/core/hooks/pay/useBuyWithFiatQuote.js.map +1 -1
  16. package/dist/cjs/react/core/hooks/transaction/useSendAndConfirmTransaction.js +12 -0
  17. package/dist/cjs/react/core/hooks/transaction/useSendAndConfirmTransaction.js.map +1 -1
  18. package/dist/cjs/react/native/hooks/transaction/useSendTransaction.js +11 -0
  19. package/dist/cjs/react/native/hooks/transaction/useSendTransaction.js.map +1 -1
  20. package/dist/cjs/react/web/ui/TransactionButton/index.js +13 -0
  21. package/dist/cjs/react/web/ui/TransactionButton/index.js.map +1 -1
  22. package/dist/cjs/transaction/actions/send-and-confirm-transaction.js +13 -0
  23. package/dist/cjs/transaction/actions/send-and-confirm-transaction.js.map +1 -1
  24. package/dist/cjs/transaction/actions/send-transaction.js +13 -0
  25. package/dist/cjs/transaction/actions/send-transaction.js.map +1 -1
  26. package/dist/cjs/transaction/actions/zksync/send-eip712-transaction.js +1 -1
  27. package/dist/cjs/transaction/actions/zksync/send-eip712-transaction.js.map +1 -1
  28. package/dist/cjs/version.js +1 -1
  29. package/dist/cjs/version.js.map +1 -1
  30. package/dist/cjs/wallets/in-app/web/lib/in-app-account.js +5 -1
  31. package/dist/cjs/wallets/in-app/web/lib/in-app-account.js.map +1 -1
  32. package/dist/cjs/wallets/in-app/web/utils/iFrameCommunication/IframeCommunicator.js +1 -0
  33. package/dist/cjs/wallets/in-app/web/utils/iFrameCommunication/IframeCommunicator.js.map +1 -1
  34. package/dist/cjs/wallets/smart/index.js +13 -2
  35. package/dist/cjs/wallets/smart/index.js.map +1 -1
  36. package/dist/cjs/wallets/smart/lib/bundler.js +11 -2
  37. package/dist/cjs/wallets/smart/lib/bundler.js.map +1 -1
  38. package/dist/cjs/wallets/smart/lib/constants.js +27 -13
  39. package/dist/cjs/wallets/smart/lib/constants.js.map +1 -1
  40. package/dist/cjs/wallets/smart/lib/packUserOp.js +75 -0
  41. package/dist/cjs/wallets/smart/lib/packUserOp.js.map +1 -0
  42. package/dist/cjs/wallets/smart/lib/paymaster.js +11 -1
  43. package/dist/cjs/wallets/smart/lib/paymaster.js.map +1 -1
  44. package/dist/cjs/wallets/smart/lib/userop.js +201 -66
  45. package/dist/cjs/wallets/smart/lib/userop.js.map +1 -1
  46. package/dist/cjs/wallets/smart/lib/utils.js +1 -1
  47. package/dist/cjs/wallets/smart/lib/utils.js.map +1 -1
  48. package/dist/cjs/wallets/smart/smart-wallet.js +2 -1
  49. package/dist/cjs/wallets/smart/smart-wallet.js.map +1 -1
  50. package/dist/cjs/wallets/smart/types.js.map +1 -1
  51. package/dist/esm/exports/wallets/smart.js +1 -1
  52. package/dist/esm/exports/wallets/smart.js.map +1 -1
  53. package/dist/esm/extensions/erc1155/drops/write/claimTo.js.map +1 -1
  54. package/dist/esm/extensions/erc4337/__generated__/IEntryPoint_v07/events/PostOpRevertReason.js +29 -0
  55. package/dist/esm/extensions/erc4337/__generated__/IEntryPoint_v07/events/PostOpRevertReason.js.map +1 -0
  56. package/dist/esm/extensions/erc4337/__generated__/IEntryPoint_v07/read/getUserOpHash.js +145 -0
  57. package/dist/esm/extensions/erc4337/__generated__/IEntryPoint_v07/read/getUserOpHash.js.map +1 -0
  58. package/dist/esm/extensions/prebuilts/__generated__/VoteERC20/write/initialize.js +177 -0
  59. package/dist/esm/extensions/prebuilts/__generated__/VoteERC20/write/initialize.js.map +1 -0
  60. package/dist/esm/extensions/prebuilts/deploy-vote.js +119 -0
  61. package/dist/esm/extensions/prebuilts/deploy-vote.js.map +1 -0
  62. package/dist/esm/react/core/hooks/pay/useBuyWithCryptoQuote.js +5 -1
  63. package/dist/esm/react/core/hooks/pay/useBuyWithCryptoQuote.js.map +1 -1
  64. package/dist/esm/react/core/hooks/pay/useBuyWithFiatQuote.js +5 -1
  65. package/dist/esm/react/core/hooks/pay/useBuyWithFiatQuote.js.map +1 -1
  66. package/dist/esm/react/core/hooks/transaction/useSendAndConfirmTransaction.js +12 -0
  67. package/dist/esm/react/core/hooks/transaction/useSendAndConfirmTransaction.js.map +1 -1
  68. package/dist/esm/react/native/hooks/transaction/useSendTransaction.js +11 -0
  69. package/dist/esm/react/native/hooks/transaction/useSendTransaction.js.map +1 -1
  70. package/dist/esm/react/web/ui/TransactionButton/index.js +13 -0
  71. package/dist/esm/react/web/ui/TransactionButton/index.js.map +1 -1
  72. package/dist/esm/transaction/actions/send-and-confirm-transaction.js +13 -0
  73. package/dist/esm/transaction/actions/send-and-confirm-transaction.js.map +1 -1
  74. package/dist/esm/transaction/actions/send-transaction.js +13 -0
  75. package/dist/esm/transaction/actions/send-transaction.js.map +1 -1
  76. package/dist/esm/transaction/actions/zksync/send-eip712-transaction.js +1 -1
  77. package/dist/esm/transaction/actions/zksync/send-eip712-transaction.js.map +1 -1
  78. package/dist/esm/version.js +1 -1
  79. package/dist/esm/version.js.map +1 -1
  80. package/dist/esm/wallets/in-app/web/lib/in-app-account.js +5 -1
  81. package/dist/esm/wallets/in-app/web/lib/in-app-account.js.map +1 -1
  82. package/dist/esm/wallets/in-app/web/utils/iFrameCommunication/IframeCommunicator.js +1 -0
  83. package/dist/esm/wallets/in-app/web/utils/iFrameCommunication/IframeCommunicator.js.map +1 -1
  84. package/dist/esm/wallets/smart/index.js +14 -3
  85. package/dist/esm/wallets/smart/index.js.map +1 -1
  86. package/dist/esm/wallets/smart/lib/bundler.js +12 -3
  87. package/dist/esm/wallets/smart/lib/bundler.js.map +1 -1
  88. package/dist/esm/wallets/smart/lib/constants.js +23 -10
  89. package/dist/esm/wallets/smart/lib/constants.js.map +1 -1
  90. package/dist/esm/wallets/smart/lib/packUserOp.js +65 -0
  91. package/dist/esm/wallets/smart/lib/packUserOp.js.map +1 -0
  92. package/dist/esm/wallets/smart/lib/paymaster.js +12 -2
  93. package/dist/esm/wallets/smart/lib/paymaster.js.map +1 -1
  94. package/dist/esm/wallets/smart/lib/userop.js +202 -67
  95. package/dist/esm/wallets/smart/lib/userop.js.map +1 -1
  96. package/dist/esm/wallets/smart/lib/utils.js +1 -1
  97. package/dist/esm/wallets/smart/lib/utils.js.map +1 -1
  98. package/dist/esm/wallets/smart/smart-wallet.js +3 -2
  99. package/dist/esm/wallets/smart/smart-wallet.js.map +1 -1
  100. package/dist/esm/wallets/smart/types.js.map +1 -1
  101. package/dist/types/exports/wallets/smart.d.ts +2 -2
  102. package/dist/types/exports/wallets/smart.d.ts.map +1 -1
  103. package/dist/types/extensions/erc1155/drops/write/claimTo.d.ts +2 -3
  104. package/dist/types/extensions/erc1155/drops/write/claimTo.d.ts.map +1 -1
  105. package/dist/types/extensions/erc4337/__generated__/IEntryPoint_v07/events/PostOpRevertReason.d.ts +57 -0
  106. package/dist/types/extensions/erc4337/__generated__/IEntryPoint_v07/events/PostOpRevertReason.d.ts.map +1 -0
  107. package/dist/types/extensions/erc4337/__generated__/IEntryPoint_v07/read/getUserOpHash.d.ts +123 -0
  108. package/dist/types/extensions/erc4337/__generated__/IEntryPoint_v07/read/getUserOpHash.d.ts.map +1 -0
  109. package/dist/types/extensions/prebuilts/__generated__/VoteERC20/write/initialize.d.ts +129 -0
  110. package/dist/types/extensions/prebuilts/__generated__/VoteERC20/write/initialize.d.ts.map +1 -0
  111. package/dist/types/extensions/prebuilts/deploy-vote.d.ts +82 -0
  112. package/dist/types/extensions/prebuilts/deploy-vote.d.ts.map +1 -0
  113. package/dist/types/react/core/hooks/pay/useBuyWithCryptoQuote.d.ts.map +1 -1
  114. package/dist/types/react/core/hooks/pay/useBuyWithFiatQuote.d.ts.map +1 -1
  115. package/dist/types/react/core/hooks/transaction/useSendAndConfirmTransaction.d.ts +12 -0
  116. package/dist/types/react/core/hooks/transaction/useSendAndConfirmTransaction.d.ts.map +1 -1
  117. package/dist/types/react/native/hooks/transaction/useSendTransaction.d.ts +11 -0
  118. package/dist/types/react/native/hooks/transaction/useSendTransaction.d.ts.map +1 -1
  119. package/dist/types/react/web/ui/TransactionButton/index.d.ts +13 -0
  120. package/dist/types/react/web/ui/TransactionButton/index.d.ts.map +1 -1
  121. package/dist/types/transaction/actions/send-and-confirm-transaction.d.ts +13 -0
  122. package/dist/types/transaction/actions/send-and-confirm-transaction.d.ts.map +1 -1
  123. package/dist/types/transaction/actions/send-transaction.d.ts +13 -0
  124. package/dist/types/transaction/actions/send-transaction.d.ts.map +1 -1
  125. package/dist/types/version.d.ts +1 -1
  126. package/dist/types/version.d.ts.map +1 -1
  127. package/dist/types/wallets/in-app/web/lib/in-app-account.d.ts.map +1 -1
  128. package/dist/types/wallets/in-app/web/utils/iFrameCommunication/IframeCommunicator.d.ts.map +1 -1
  129. package/dist/types/wallets/smart/index.d.ts.map +1 -1
  130. package/dist/types/wallets/smart/lib/bundler.d.ts +3 -3
  131. package/dist/types/wallets/smart/lib/bundler.d.ts.map +1 -1
  132. package/dist/types/wallets/smart/lib/constants.d.ts +6 -6
  133. package/dist/types/wallets/smart/lib/constants.d.ts.map +1 -1
  134. package/dist/types/wallets/smart/lib/packUserOp.d.ts +16 -0
  135. package/dist/types/wallets/smart/lib/packUserOp.d.ts.map +1 -0
  136. package/dist/types/wallets/smart/lib/paymaster.d.ts +3 -3
  137. package/dist/types/wallets/smart/lib/paymaster.d.ts.map +1 -1
  138. package/dist/types/wallets/smart/lib/userop.d.ts +6 -4
  139. package/dist/types/wallets/smart/lib/userop.d.ts.map +1 -1
  140. package/dist/types/wallets/smart/lib/utils.d.ts +2 -2
  141. package/dist/types/wallets/smart/lib/utils.d.ts.map +1 -1
  142. package/dist/types/wallets/smart/smart-wallet.d.ts.map +1 -1
  143. package/dist/types/wallets/smart/types.d.ts +62 -9
  144. package/dist/types/wallets/smart/types.d.ts.map +1 -1
  145. package/package.json +1 -1
  146. package/src/exports/wallets/smart.ts +4 -2
  147. package/src/extensions/erc1155/drops/write/claimTo.ts +2 -3
  148. package/src/extensions/erc4337/__generated__/IEntryPoint_v07/events/PostOpRevertReason.ts +49 -0
  149. package/src/extensions/erc4337/__generated__/IEntryPoint_v07/read/getUserOpHash.ts +181 -0
  150. package/src/extensions/prebuilts/__generated__/VoteERC20/write/initialize.ts +230 -0
  151. package/src/extensions/prebuilts/deploy-vote.test.ts +73 -0
  152. package/src/extensions/prebuilts/deploy-vote.ts +213 -0
  153. package/src/extensions/vote/read/proposalExists.test.ts +123 -0
  154. package/src/react/core/hooks/pay/useBuyWithCryptoQuote.ts +16 -1
  155. package/src/react/core/hooks/pay/useBuyWithFiatQuote.ts +16 -1
  156. package/src/react/core/hooks/transaction/useSendAndConfirmTransaction.ts +12 -0
  157. package/src/react/native/hooks/transaction/useSendTransaction.tsx +11 -0
  158. package/src/react/web/ui/TransactionButton/index.tsx +13 -0
  159. package/src/transaction/actions/send-and-confirm-transaction.ts +13 -0
  160. package/src/transaction/actions/send-transaction.ts +13 -0
  161. package/src/transaction/actions/zksync/send-eip712-transaction.ts +1 -1
  162. package/src/version.ts +1 -1
  163. package/src/wallets/in-app/web/lib/in-app-account.ts +5 -1
  164. package/src/wallets/in-app/web/utils/iFrameCommunication/IframeCommunicator.ts +1 -0
  165. package/src/wallets/smart/index.ts +21 -5
  166. package/src/wallets/smart/lib/bundler.ts +21 -5
  167. package/src/wallets/smart/lib/constants.ts +29 -10
  168. package/src/wallets/smart/lib/packUserOp.ts +79 -0
  169. package/src/wallets/smart/lib/paymaster.ts +22 -5
  170. package/src/wallets/smart/lib/userop.ts +292 -85
  171. package/src/wallets/smart/lib/utils.ts +11 -4
  172. package/src/wallets/smart/smart-wallet-integration-v07.test.ts +206 -0
  173. package/src/wallets/smart/smart-wallet-integration.test.ts +1 -1
  174. package/src/wallets/smart/smart-wallet-zksync.test.ts +3 -3
  175. package/src/wallets/smart/smart-wallet.ts +4 -2
  176. package/src/wallets/smart/types.ts +73 -9
@@ -6,17 +6,18 @@ exports.signUserOp = signUserOp;
6
6
  const viem_1 = require("viem");
7
7
  const contract_js_1 = require("../../../contract/contract.js");
8
8
  const getNonce_js_1 = require("../../../extensions/erc4337/__generated__/IEntryPoint/read/getNonce.js");
9
+ const getUserOpHash_js_1 = require("../../../extensions/erc4337/__generated__/IEntryPoint/read/getUserOpHash.js");
10
+ const getUserOpHash_js_2 = require("../../../extensions/erc4337/__generated__/IEntryPoint_v07/read/getUserOpHash.js");
9
11
  const fee_data_js_1 = require("../../../gas/fee-data.js");
10
12
  const encode_js_1 = require("../../../transaction/actions/encode.js");
11
- const encodeAbiParameters_js_1 = require("../../../utils/abi/encodeAbiParameters.js");
12
13
  const is_contract_deployed_js_1 = require("../../../utils/bytecode/is-contract-deployed.js");
13
14
  const to_bytes_js_1 = require("../../../utils/encoding/to-bytes.js");
14
15
  const fetch_js_1 = require("../../../utils/fetch.js");
15
- const keccak256_js_1 = require("../../../utils/hashing/keccak256.js");
16
16
  const resolve_promised_value_js_1 = require("../../../utils/promise/resolve-promised-value.js");
17
17
  const bundler_js_1 = require("./bundler.js");
18
18
  const calls_js_1 = require("./calls.js");
19
19
  const constants_js_1 = require("./constants.js");
20
+ const packUserOp_js_1 = require("./packUserOp.js");
20
21
  const paymaster_js_1 = require("./paymaster.js");
21
22
  const utils_js_1 = require("./utils.js");
22
23
  /**
@@ -74,23 +75,66 @@ async function createUnsignedUserOp(args) {
74
75
  const { transaction: executeTx, accountContract, factoryContract, adminAddress, overrides, sponsorGas, } = args;
75
76
  const chain = executeTx.chain;
76
77
  const client = executeTx.client;
77
- const isDeployed = await (0, is_contract_deployed_js_1.isContractDeployed)(accountContract);
78
- const initCode = isDeployed
79
- ? "0x"
80
- : await getAccountInitCode({
81
- factoryContract: factoryContract,
82
- adminAddress,
83
- accountSalt: overrides?.accountSalt,
84
- createAccountOverride: overrides?.createAccount,
85
- });
86
- const callData = await (0, encode_js_1.encode)(executeTx);
87
78
  const bundlerOptions = {
88
79
  client,
89
80
  chain,
90
81
  entrypointAddress: overrides?.entrypointAddress,
91
82
  };
83
+ const entrypointVersion = (0, constants_js_1.getEntryPointVersion)(args.overrides?.entrypointAddress || constants_js_1.ENTRYPOINT_ADDRESS_v0_6);
84
+ const [isDeployed, callData, gasFees, nonce] = await Promise.all([
85
+ (0, is_contract_deployed_js_1.isContractDeployed)(accountContract),
86
+ (0, encode_js_1.encode)(executeTx),
87
+ getGasFees({
88
+ executeTx,
89
+ bundlerOptions,
90
+ chain,
91
+ client,
92
+ }),
93
+ getAccountNonce({
94
+ accountContract,
95
+ chain,
96
+ client,
97
+ entrypointAddress: overrides?.entrypointAddress,
98
+ getNonceOverride: overrides?.getAccountNonce,
99
+ }),
100
+ ]);
101
+ const { maxFeePerGas, maxPriorityFeePerGas } = gasFees;
102
+ if (entrypointVersion === "v0.7") {
103
+ return populateUserOp_v0_7({
104
+ bundlerOptions,
105
+ factoryContract,
106
+ accountContract,
107
+ adminAddress,
108
+ sponsorGas,
109
+ overrides,
110
+ isDeployed,
111
+ nonce,
112
+ callData,
113
+ maxFeePerGas,
114
+ maxPriorityFeePerGas,
115
+ });
116
+ }
117
+ // default to v0.6
118
+ return populateUserOp_v0_6({
119
+ bundlerOptions,
120
+ factoryContract,
121
+ accountContract,
122
+ adminAddress,
123
+ sponsorGas,
124
+ overrides,
125
+ isDeployed,
126
+ nonce,
127
+ callData,
128
+ maxFeePerGas,
129
+ maxPriorityFeePerGas,
130
+ });
131
+ }
132
+ async function getGasFees(args) {
133
+ const { executeTx, bundlerOptions, chain, client } = args;
92
134
  let { maxFeePerGas, maxPriorityFeePerGas } = executeTx;
93
- const bundlerUrl = overrides?.bundlerUrl ?? (0, constants_js_1.getDefaultBundlerUrl)(chain);
135
+ const entrypointVersion = (0, constants_js_1.getEntryPointVersion)(bundlerOptions.entrypointAddress || constants_js_1.ENTRYPOINT_ADDRESS_v0_6);
136
+ const bundlerVersion = entrypointVersion === "v0.6" ? "v1" : "v2";
137
+ const bundlerUrl = bundlerOptions?.bundlerUrl ?? (0, constants_js_1.getDefaultBundlerUrl)(chain, bundlerVersion);
94
138
  if ((0, fetch_js_1.isThirdwebUrl)(bundlerUrl)) {
95
139
  // get gas prices from bundler
96
140
  const bundlerGasPrice = await (0, bundler_js_1.getUserOpGasFees)({
@@ -119,13 +163,119 @@ async function createUnsignedUserOp(args) {
119
163
  maxFeePerGas = resolvedMaxFeePerGas ?? feeData.maxFeePerGas ?? 0n;
120
164
  }
121
165
  }
122
- const nonce = await getAccountNonce({
123
- accountContract,
124
- chain,
125
- client,
126
- entrypointAddress: overrides?.entrypointAddress,
127
- getNonceOverride: overrides?.getAccountNonce,
128
- });
166
+ return { maxFeePerGas, maxPriorityFeePerGas };
167
+ }
168
+ async function populateUserOp_v0_7(args) {
169
+ const { bundlerOptions, isDeployed, factoryContract, accountContract, adminAddress, sponsorGas, overrides, nonce, callData, maxFeePerGas, maxPriorityFeePerGas, } = args;
170
+ const { chain, client } = bundlerOptions;
171
+ const factory = isDeployed ? undefined : factoryContract.address;
172
+ const factoryData = isDeployed
173
+ ? "0x"
174
+ : await (0, encode_js_1.encode)((0, calls_js_1.prepareCreateAccount)({
175
+ factoryContract: factoryContract,
176
+ adminAddress,
177
+ accountSalt: overrides?.accountSalt,
178
+ createAccountOverride: overrides?.createAccount,
179
+ }));
180
+ const partialOp = {
181
+ sender: accountContract.address,
182
+ nonce,
183
+ callData,
184
+ maxFeePerGas,
185
+ maxPriorityFeePerGas,
186
+ callGasLimit: 0n,
187
+ verificationGasLimit: 0n,
188
+ preVerificationGas: 0n,
189
+ factory,
190
+ factoryData,
191
+ paymaster: undefined,
192
+ paymasterData: "0x",
193
+ paymasterVerificationGasLimit: 0n,
194
+ paymasterPostOpGasLimit: 0n,
195
+ signature: constants_js_1.DUMMY_SIGNATURE,
196
+ };
197
+ if (sponsorGas) {
198
+ const paymasterResult = (await (0, paymaster_js_1.getPaymasterAndData)({
199
+ userOp: partialOp,
200
+ chain,
201
+ client,
202
+ entrypointAddress: overrides?.entrypointAddress,
203
+ paymasterOverride: overrides?.paymaster,
204
+ }));
205
+ if (paymasterResult.paymaster && paymasterResult.paymasterData) {
206
+ partialOp.paymaster = paymasterResult.paymaster;
207
+ partialOp.paymasterData = paymasterResult.paymasterData;
208
+ }
209
+ // paymaster can have the gas limits in the response
210
+ if (paymasterResult.callGasLimit &&
211
+ paymasterResult.verificationGasLimit &&
212
+ paymasterResult.preVerificationGas &&
213
+ paymasterResult.paymasterPostOpGasLimit &&
214
+ paymasterResult.paymasterVerificationGasLimit) {
215
+ partialOp.callGasLimit = paymasterResult.callGasLimit;
216
+ partialOp.verificationGasLimit = paymasterResult.verificationGasLimit;
217
+ partialOp.preVerificationGas = paymasterResult.preVerificationGas;
218
+ partialOp.paymasterPostOpGasLimit =
219
+ paymasterResult.paymasterPostOpGasLimit;
220
+ partialOp.paymasterVerificationGasLimit =
221
+ paymasterResult.paymasterVerificationGasLimit;
222
+ }
223
+ else {
224
+ // otherwise fallback to bundler for gas limits
225
+ const estimates = await (0, bundler_js_1.estimateUserOpGas)({
226
+ userOp: partialOp,
227
+ options: bundlerOptions,
228
+ });
229
+ partialOp.callGasLimit = estimates.callGasLimit;
230
+ partialOp.verificationGasLimit = estimates.verificationGasLimit;
231
+ partialOp.preVerificationGas = estimates.preVerificationGas;
232
+ partialOp.paymasterPostOpGasLimit =
233
+ paymasterResult.paymasterPostOpGasLimit || 0n;
234
+ partialOp.paymasterVerificationGasLimit =
235
+ paymasterResult.paymasterVerificationGasLimit || 0n;
236
+ // need paymaster to re-sign after estimates
237
+ const paymasterResult2 = (await (0, paymaster_js_1.getPaymasterAndData)({
238
+ userOp: partialOp,
239
+ chain,
240
+ client,
241
+ entrypointAddress: overrides?.entrypointAddress,
242
+ paymasterOverride: overrides?.paymaster,
243
+ }));
244
+ if (paymasterResult2.paymaster && paymasterResult2.paymasterData) {
245
+ partialOp.paymaster = paymasterResult2.paymaster;
246
+ partialOp.paymasterData = paymasterResult2.paymasterData;
247
+ }
248
+ }
249
+ }
250
+ else {
251
+ // not gasless, so we just need to estimate gas limits
252
+ const estimates = await (0, bundler_js_1.estimateUserOpGas)({
253
+ userOp: partialOp,
254
+ options: bundlerOptions,
255
+ });
256
+ partialOp.callGasLimit = estimates.callGasLimit;
257
+ partialOp.verificationGasLimit = estimates.verificationGasLimit;
258
+ partialOp.preVerificationGas = estimates.preVerificationGas;
259
+ partialOp.paymasterPostOpGasLimit = estimates.paymasterPostOpGasLimit || 0n;
260
+ partialOp.paymasterVerificationGasLimit =
261
+ estimates.paymasterVerificationGasLimit || 0n;
262
+ }
263
+ return {
264
+ ...partialOp,
265
+ signature: "0x",
266
+ };
267
+ }
268
+ async function populateUserOp_v0_6(args) {
269
+ const { bundlerOptions, isDeployed, factoryContract, accountContract, adminAddress, sponsorGas, overrides, nonce, callData, maxFeePerGas, maxPriorityFeePerGas, } = args;
270
+ const { chain, client } = bundlerOptions;
271
+ const initCode = isDeployed
272
+ ? "0x"
273
+ : await getAccountInitCode({
274
+ factoryContract: factoryContract,
275
+ adminAddress,
276
+ accountSalt: overrides?.accountSalt,
277
+ createAccountOverride: overrides?.createAccount,
278
+ });
129
279
  const partialOp = {
130
280
  sender: accountContract.address,
131
281
  nonce,
@@ -147,7 +297,9 @@ async function createUnsignedUserOp(args) {
147
297
  entrypointAddress: overrides?.entrypointAddress,
148
298
  paymasterOverride: overrides?.paymaster,
149
299
  });
150
- const paymasterAndData = paymasterResult.paymasterAndData;
300
+ const paymasterAndData = "paymasterAndData" in paymasterResult
301
+ ? paymasterResult.paymasterAndData
302
+ : "0x";
151
303
  if (paymasterAndData && paymasterAndData !== "0x") {
152
304
  partialOp.paymasterAndData = paymasterAndData;
153
305
  }
@@ -177,9 +329,11 @@ async function createUnsignedUserOp(args) {
177
329
  entrypointAddress: overrides?.entrypointAddress,
178
330
  paymasterOverride: overrides?.paymaster,
179
331
  });
180
- if (paymasterResult2.paymasterAndData &&
181
- paymasterResult2.paymasterAndData !== "0x") {
182
- partialOp.paymasterAndData = paymasterResult2.paymasterAndData;
332
+ const paymasterAndData2 = "paymasterAndData" in paymasterResult2
333
+ ? paymasterResult2.paymasterAndData
334
+ : "0x";
335
+ if (paymasterAndData2 && paymasterAndData2 !== "0x") {
336
+ partialOp.paymasterAndData = paymasterAndData2;
183
337
  }
184
338
  }
185
339
  }
@@ -219,11 +373,29 @@ async function createUnsignedUserOp(args) {
219
373
  */
220
374
  async function signUserOp(args) {
221
375
  const { userOp, chain, entrypointAddress, adminAccount } = args;
222
- const userOpHash = getUserOpHash({
223
- userOp,
224
- entryPoint: entrypointAddress || constants_js_1.ENTRYPOINT_ADDRESS_v0_6,
225
- chainId: chain.id,
226
- });
376
+ const entrypointVersion = (0, constants_js_1.getEntryPointVersion)(entrypointAddress || constants_js_1.ENTRYPOINT_ADDRESS_v0_6);
377
+ let userOpHash;
378
+ if (entrypointVersion === "v0.7") {
379
+ const packedUserOp = (0, packUserOp_js_1.getPackedUserOperation)(userOp);
380
+ userOpHash = await (0, getUserOpHash_js_2.getUserOpHash)({
381
+ contract: (0, contract_js_1.getContract)({
382
+ address: entrypointAddress || constants_js_1.ENTRYPOINT_ADDRESS_v0_7,
383
+ chain,
384
+ client: args.client,
385
+ }),
386
+ userOp: packedUserOp,
387
+ });
388
+ }
389
+ else {
390
+ userOpHash = await (0, getUserOpHash_js_1.getUserOpHash)({
391
+ contract: (0, contract_js_1.getContract)({
392
+ address: entrypointAddress || constants_js_1.ENTRYPOINT_ADDRESS_v0_6,
393
+ chain,
394
+ client: args.client,
395
+ }),
396
+ userOp: userOp,
397
+ });
398
+ }
227
399
  if (adminAccount.signMessage) {
228
400
  const signature = await adminAccount.signMessage({
229
401
  message: {
@@ -262,41 +434,4 @@ async function getAccountNonce(options) {
262
434
  sender: accountContract.address,
263
435
  });
264
436
  }
265
- /**
266
- * Get the hash of a user operation.
267
- * @param args - The user operation, entrypoint address, and chain ID
268
- * @returns - The hash of the user operation
269
- * @walletUtils
270
- */
271
- function getUserOpHash(args) {
272
- const { userOp, entryPoint, chainId } = args;
273
- const hashedInitCode = (0, keccak256_js_1.keccak256)(userOp.initCode);
274
- const hashedCallData = (0, keccak256_js_1.keccak256)(userOp.callData);
275
- const hashedPaymasterAndData = (0, keccak256_js_1.keccak256)(userOp.paymasterAndData);
276
- const packedUserOp = (0, encodeAbiParameters_js_1.encodeAbiParameters)([
277
- { type: "address" },
278
- { type: "uint256" },
279
- { type: "bytes32" },
280
- { type: "bytes32" },
281
- { type: "uint256" },
282
- { type: "uint256" },
283
- { type: "uint256" },
284
- { type: "uint256" },
285
- { type: "uint256" },
286
- { type: "bytes32" },
287
- ], [
288
- userOp.sender,
289
- userOp.nonce,
290
- hashedInitCode,
291
- hashedCallData,
292
- userOp.callGasLimit,
293
- userOp.verificationGasLimit,
294
- userOp.preVerificationGas,
295
- userOp.maxFeePerGas,
296
- userOp.maxPriorityFeePerGas,
297
- hashedPaymasterAndData,
298
- ]);
299
- const encoded = (0, encodeAbiParameters_js_1.encodeAbiParameters)([{ type: "bytes32" }, { type: "address" }, { type: "uint256" }], [(0, keccak256_js_1.keccak256)(packedUserOp), entryPoint, BigInt(chainId)]);
300
- return (0, keccak256_js_1.keccak256)(encoded);
301
- }
302
437
  //# sourceMappingURL=userop.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"userop.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/userop.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"userop.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/userop.ts"],"names":[],"mappings":"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"}
@@ -34,7 +34,7 @@ function hexlifyUserOp(userOp) {
34
34
  return Object.fromEntries(Object.entries(userOp).map(([key, val]) => [
35
35
  key,
36
36
  // turn any value that's not hex into hex
37
- (0, hex_js_1.isHex)(val) ? val : (0, hex_js_1.toHex)(val),
37
+ val === undefined || val === null || (0, hex_js_1.isHex)(val) ? val : (0, hex_js_1.toHex)(val),
38
38
  ]));
39
39
  }
40
40
  function isNativeAAChain(chain) {
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/utils.ts"],"names":[],"mappings":";;;AAkCA,sCAQC;AAED,0CAOC;AAnDD,+BAA8B;AAE9B,2DAA2E;AAGpE,MAAM,qBAAqB,GAAG,GAAW,EAAE;IAChD,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC;IAC9D,OAAO,CACL,CAAC,KAAK,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC;QACtB,CAAC,KAAK,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC;QACtB,CAAC,KAAK,IAAI,MAAM,CAAC,EAAE,CAAC,CAAC;QACrB,CAAC,KAAK,IAAI,MAAM,CAAC,EAAE,CAAC,CAAC;QACrB,CAAC,KAAK,IAAI,MAAM,CAAC,EAAE,CAAC,CAAC;QACrB,KAAK,CACN,CAAC;AACJ,CAAC,CAAC;AAfW,QAAA,qBAAqB,yBAehC;AAEF;;GAEG;AACI,MAAM,WAAW,GAAG,GAAG,EAAE;IAC9B,OAAO,MAAM,CACX,IAAA,aAAM,EAAC,CAAC,IAAA,oBAAW,EAAC,IAAA,6BAAqB,GAAE,CAAC,EAAE,oBAAoB,CAAC,CAAC,CACrE,CAAC;AACJ,CAAC,CAAC;AAJW,QAAA,WAAW,eAItB;AAEF;;GAEG;AACH,SAAgB,aAAa,CAAC,MAAqB;IACjD,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC;QACzC,GAAG;QACH,yCAAyC;QACzC,IAAA,cAAK,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAA,cAAK,EAAC,GAAG,CAAC;KAC9B,CAAC,CACmB,CAAC;AAC1B,CAAC;AAED,SAAgB,eAAe,CAAC,KAAY;IAC1C,OAAO,CACL,KAAK,CAAC,EAAE,KAAK,GAAG;QAChB,KAAK,CAAC,EAAE,KAAK,GAAG;QAChB,KAAK,CAAC,EAAE,KAAK,GAAG;QAChB,KAAK,CAAC,EAAE,KAAK,KAAK,CACnB,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/utils.ts"],"names":[],"mappings":";;;AAuCA,sCAUC;AAED,0CAOC;AA1DD,+BAA8B;AAE9B,2DAA2E;AAQpE,MAAM,qBAAqB,GAAG,GAAW,EAAE;IAChD,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC;IAC9D,OAAO,CACL,CAAC,KAAK,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC;QACtB,CAAC,KAAK,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC;QACtB,CAAC,KAAK,IAAI,MAAM,CAAC,EAAE,CAAC,CAAC;QACrB,CAAC,KAAK,IAAI,MAAM,CAAC,EAAE,CAAC,CAAC;QACrB,CAAC,KAAK,IAAI,MAAM,CAAC,EAAE,CAAC,CAAC;QACrB,KAAK,CACN,CAAC;AACJ,CAAC,CAAC;AAfW,QAAA,qBAAqB,yBAehC;AAEF;;GAEG;AACI,MAAM,WAAW,GAAG,GAAG,EAAE;IAC9B,OAAO,MAAM,CACX,IAAA,aAAM,EAAC,CAAC,IAAA,oBAAW,EAAC,IAAA,6BAAqB,GAAE,CAAC,EAAE,oBAAoB,CAAC,CAAC,CACrE,CAAC;AACJ,CAAC,CAAC;AAJW,QAAA,WAAW,eAItB;AAEF;;GAEG;AACH,SAAgB,aAAa,CAC3B,MAA2C;IAE3C,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC;QACzC,GAAG;QACH,yCAAyC;QACzC,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,IAAI,IAAI,IAAA,cAAK,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAA,cAAK,EAAC,GAAG,CAAC;KACnE,CAAC,CAC8C,CAAC;AACrD,CAAC;AAED,SAAgB,eAAe,CAAC,KAAY;IAC1C,OAAO,CACL,KAAK,CAAC,EAAE,KAAK,GAAG;QAChB,KAAK,CAAC,EAAE,KAAK,GAAG;QAChB,KAAK,CAAC,EAAE,KAAK,GAAG;QAChB,KAAK,CAAC,EAAE,KAAK,KAAK,CACnB,CAAC;AACJ,CAAC"}
@@ -154,7 +154,8 @@ function smartWallet(createOptions) {
154
154
  }
155
155
  // check if factory is deployed
156
156
  const factory = (0, contract_js_1.getContract)({
157
- address: createOptions.factoryAddress || constants_js_1.DEFAULT_ACCOUNT_FACTORY,
157
+ address: createOptions.factoryAddress ||
158
+ (0, constants_js_1.getDefaultAccountFactory)(createOptions.overrides?.entrypointAddress),
158
159
  chain: newChain,
159
160
  client: lastConnectOptions.client,
160
161
  });
@@ -1 +1 @@
1
- {"version":3,"file":"smart-wallet.js","sourceRoot":"","sources":["../../../../src/wallets/smart/smart-wallet.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"smart-wallet.js","sourceRoot":"","sources":["../../../../src/wallets/smart/smart-wallet.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/wallets/smart/types.ts"],"names":[],"mappings":";;AA6IA,gEA4CC;AA5CD,SAAgB,0BAA0B,CACxC,gBAAsC;IAEtC,MAAM,EAAE,OAAO,EAAE,kBAAkB,EAAE,GAAG,gBAAgB,CAAC;IAEzD,MAAM,OAAO,GAAG;QACd,GAAG,kBAAkB;QACrB,eAAe,EAAE,kBAAkB,CAAC,eAAe;QACnD,WAAW,EAAE,kBAAkB,CAAC,WAAW;YACzC,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,WAAW,CAAC;YACxC,CAAC,CAAC,IAAI;QACR,eAAe,EAAE,kBAAkB,CAAC,eAAe;YACjD,CAAC,CAAC,kBAAkB,CAAC,eAAe;YACpC,CAAC,CAAC,IAAI;QACR,iBAAiB,EAAE,kBAAkB,CAAC,iBAAiB;YACrD,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,iBAAiB,CAAC;YAC9C,CAAC,CAAC,IAAI;QACR,iBAAiB,EAAE,kBAAkB,CAAC,iBAAiB;YACrD,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,iBAAiB,CAAC;YAC9C,CAAC,CAAC,IAAI;QACR,OAAO,EAAE,kBAAkB,CAAC,OAAO;YACjC,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC;YACpC,CAAC,CAAC,IAAI;QACR,IAAI,EAAE,kBAAkB,CAAC,IAAI;QAC7B,EAAE,EAAE,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI;QACxD,gBAAgB,EAAE,kBAAkB,CAAC,gBAAgB;QACrD,MAAM,EAAE,kBAAkB,CAAC,MAAM;QACjC,IAAI,EAAE,kBAAkB,CAAC,IAAI;KACR,CAAC;IAExB,IAAI,kBAAkB,CAAC,YAAY;QACjC,OAAO,CAAC,YAAY,GAAG,MAAM,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;IACjE,IAAI,kBAAkB,CAAC,WAAW;QAChC,OAAO,CAAC,WAAW,GAAG,MAAM,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAE/D,MAAM,aAAa,GAAG;QACpB,GAAG,gBAAgB;QACnB,OAAO;QACP,UAAU,EAAE,gBAAgB,CAAC,UAAU;QACvC,aAAa,EAAE,MAAM,CAAC,gBAAgB,CAAC,aAAa,CAAC;QACrD,aAAa,EAAE,MAAM,CAAC,gBAAgB,CAAC,aAAa,CAAC;QACrD,KAAK,EAAE,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC;KACd,CAAC;IAC1B,OAAO,aAAa,CAAC;AACvB,CAAC"}
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/wallets/smart/types.ts"],"names":[],"mappings":";;AA6MA,gEA4CC;AA5CD,SAAgB,0BAA0B,CACxC,gBAAsC;IAEtC,MAAM,EAAE,OAAO,EAAE,kBAAkB,EAAE,GAAG,gBAAgB,CAAC;IAEzD,MAAM,OAAO,GAAG;QACd,GAAG,kBAAkB;QACrB,eAAe,EAAE,kBAAkB,CAAC,eAAe;QACnD,WAAW,EAAE,kBAAkB,CAAC,WAAW;YACzC,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,WAAW,CAAC;YACxC,CAAC,CAAC,IAAI;QACR,eAAe,EAAE,kBAAkB,CAAC,eAAe;YACjD,CAAC,CAAC,kBAAkB,CAAC,eAAe;YACpC,CAAC,CAAC,IAAI;QACR,iBAAiB,EAAE,kBAAkB,CAAC,iBAAiB;YACrD,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,iBAAiB,CAAC;YAC9C,CAAC,CAAC,IAAI;QACR,iBAAiB,EAAE,kBAAkB,CAAC,iBAAiB;YACrD,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,iBAAiB,CAAC;YAC9C,CAAC,CAAC,IAAI;QACR,OAAO,EAAE,kBAAkB,CAAC,OAAO;YACjC,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC;YACpC,CAAC,CAAC,IAAI;QACR,IAAI,EAAE,kBAAkB,CAAC,IAAI;QAC7B,EAAE,EAAE,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI;QACxD,gBAAgB,EAAE,kBAAkB,CAAC,gBAAgB;QACrD,MAAM,EAAE,kBAAkB,CAAC,MAAM;QACjC,IAAI,EAAE,kBAAkB,CAAC,IAAI;KACR,CAAC;IAExB,IAAI,kBAAkB,CAAC,YAAY;QACjC,OAAO,CAAC,YAAY,GAAG,MAAM,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;IACjE,IAAI,kBAAkB,CAAC,WAAW;QAChC,OAAO,CAAC,WAAW,GAAG,MAAM,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAE/D,MAAM,aAAa,GAAG;QACpB,GAAG,gBAAgB;QACnB,OAAO;QACP,UAAU,EAAE,gBAAgB,CAAC,UAAU;QACvC,aAAa,EAAE,MAAM,CAAC,gBAAgB,CAAC,aAAa,CAAC;QACrD,aAAa,EAAE,MAAM,CAAC,gBAAgB,CAAC,aAAa,CAAC;QACrD,KAAK,EAAE,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC;KACd,CAAC;IAC1B,OAAO,aAAa,CAAC;AACvB,CAAC"}
@@ -3,5 +3,5 @@ export { waitForUserOpReceipt, createUnsignedUserOp, signUserOp, } from "../../w
3
3
  export { getUserOpReceipt, getUserOpReceiptRaw, bundleUserOp, getUserOpGasFees, estimateUserOpGas, } from "../../wallets/smart/lib/bundler.js";
4
4
  export { predictAddress } from "../../wallets/smart/lib/calls.js";
5
5
  export { getPaymasterAndData } from "../../wallets/smart/lib/paymaster.js";
6
- export { ENTRYPOINT_ADDRESS_v0_6, DEFAULT_ACCOUNT_FACTORY, } from "../../wallets/smart/lib/constants.js";
6
+ export { ENTRYPOINT_ADDRESS_v0_6, ENTRYPOINT_ADDRESS_v0_7, DEFAULT_ACCOUNT_FACTORY_V0_6, DEFAULT_ACCOUNT_FACTORY_V0_7, } from "../../wallets/smart/lib/constants.js";
7
7
  //# sourceMappingURL=smart.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"smart.js","sourceRoot":"","sources":["../../../../src/exports/wallets/smart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAElE,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,UAAU,GACX,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,YAAY,EACZ,gBAAgB,EAChB,iBAAiB,GAClB,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAElE,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAS3E,OAAO,EACL,uBAAuB,EACvB,uBAAuB,GACxB,MAAM,sCAAsC,CAAC"}
1
+ {"version":3,"file":"smart.js","sourceRoot":"","sources":["../../../../src/exports/wallets/smart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAElE,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,UAAU,GACX,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,YAAY,EACZ,gBAAgB,EAChB,iBAAiB,GAClB,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAElE,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAS3E,OAAO,EACL,uBAAuB,EACvB,uBAAuB,EACvB,4BAA4B,EAC5B,4BAA4B,GAC7B,MAAM,sCAAsC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"claimTo.js","sourceRoot":"","sources":["../../../../../../src/extensions/erc1155/drops/write/claimTo.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,wDAAwD,CAAC;AACxF,OAAO,EAAE,KAAK,EAAE,MAAM,8CAA8C,CAAC;AAYrE;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,UAAU,OAAO,CAAC,OAA8C;IACpE,OAAO,KAAK,CAAC;QACX,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,KAAK,CAAC,WAAW;YACf,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC;gBAClC,IAAI,EAAE,SAAS;gBACf,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,OAAO,EAAE,OAAO,CAAC,OAAO;aACzB,CAAC,CAAC;YAEH,OAAO;gBACL,GAAG,MAAM;gBACT,OAAO,EAAE,OAAO,CAAC,OAAO;aACzB,CAAC;QACJ,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"claimTo.js","sourceRoot":"","sources":["../../../../../../src/extensions/erc1155/drops/write/claimTo.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,wDAAwD,CAAC;AACxF,OAAO,EAAE,KAAK,EAAE,MAAM,8CAA8C,CAAC;AAYrE;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,UAAU,OAAO,CAAC,OAA8C;IACpE,OAAO,KAAK,CAAC;QACX,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,KAAK,CAAC,WAAW;YACf,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC;gBAClC,IAAI,EAAE,SAAS;gBACf,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,OAAO,EAAE,OAAO,CAAC,OAAO;aACzB,CAAC,CAAC;YAEH,OAAO;gBACL,GAAG,MAAM;gBACT,OAAO,EAAE,OAAO,CAAC,OAAO;aACzB,CAAC;QACJ,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
@@ -0,0 +1,29 @@
1
+ import { prepareEvent } from "../../../../../event/prepare-event.js";
2
+ /**
3
+ * Creates an event object for the PostOpRevertReason event.
4
+ * @param filters - Optional filters to apply to the event.
5
+ * @returns The prepared event object.
6
+ * @extension ERC4337
7
+ * @example
8
+ * ```ts
9
+ * import { getContractEvents } from "thirdweb";
10
+ * import { postOpRevertReasonEvent } from "thirdweb/extensions/erc4337";
11
+ *
12
+ * const events = await getContractEvents({
13
+ * contract,
14
+ * events: [
15
+ * postOpRevertReasonEvent({
16
+ * userOpHash: ...,
17
+ * sender: ...,
18
+ * })
19
+ * ],
20
+ * });
21
+ * ```
22
+ */
23
+ export function postOpRevertReasonEvent(filters = {}) {
24
+ return prepareEvent({
25
+ signature: "event PostOpRevertReason(bytes32 indexed userOpHash, address indexed sender, uint256 nonce, bytes revertReason)",
26
+ filters,
27
+ });
28
+ }
29
+ //# sourceMappingURL=PostOpRevertReason.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"PostOpRevertReason.js","sourceRoot":"","sources":["../../../../../../../src/extensions/erc4337/__generated__/IEntryPoint_v07/events/PostOpRevertReason.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AAmBrE;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,UAAU,uBAAuB,CACrC,UAA0C,EAAE;IAE5C,OAAO,YAAY,CAAC;QAClB,SAAS,EACP,iHAAiH;QACnH,OAAO;KACR,CAAC,CAAC;AACL,CAAC"}
@@ -0,0 +1,145 @@
1
+ import { readContract } from "../../../../../transaction/read-contract.js";
2
+ import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
3
+ import { decodeAbiParameters } from "viem";
4
+ import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
5
+ export const FN_SELECTOR = "0x22cdde4c";
6
+ const FN_INPUTS = [
7
+ {
8
+ type: "tuple",
9
+ name: "userOp",
10
+ components: [
11
+ {
12
+ type: "address",
13
+ name: "sender",
14
+ },
15
+ {
16
+ type: "uint256",
17
+ name: "nonce",
18
+ },
19
+ {
20
+ type: "bytes",
21
+ name: "initCode",
22
+ },
23
+ {
24
+ type: "bytes",
25
+ name: "callData",
26
+ },
27
+ {
28
+ type: "bytes32",
29
+ name: "accountGasLimits",
30
+ },
31
+ {
32
+ type: "uint256",
33
+ name: "preVerificationGas",
34
+ },
35
+ {
36
+ type: "bytes32",
37
+ name: "gasFees",
38
+ },
39
+ {
40
+ type: "bytes",
41
+ name: "paymasterAndData",
42
+ },
43
+ {
44
+ type: "bytes",
45
+ name: "signature",
46
+ },
47
+ ],
48
+ },
49
+ ];
50
+ const FN_OUTPUTS = [
51
+ {
52
+ type: "bytes32",
53
+ },
54
+ ];
55
+ /**
56
+ * Checks if the `getUserOpHash` method is supported by the given contract.
57
+ * @param contract The ThirdwebContract.
58
+ * @returns A promise that resolves to a boolean indicating if the `getUserOpHash` method is supported.
59
+ * @extension ERC4337
60
+ * @example
61
+ * ```ts
62
+ * import { isGetUserOpHashSupported } from "thirdweb/extensions/erc4337";
63
+ *
64
+ * const supported = await isGetUserOpHashSupported(contract);
65
+ * ```
66
+ */
67
+ export async function isGetUserOpHashSupported(contract) {
68
+ return detectMethod({
69
+ contract,
70
+ method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS],
71
+ });
72
+ }
73
+ /**
74
+ * Encodes the parameters for the "getUserOpHash" function.
75
+ * @param options - The options for the getUserOpHash function.
76
+ * @returns The encoded ABI parameters.
77
+ * @extension ERC4337
78
+ * @example
79
+ * ```ts
80
+ * import { encodeGetUserOpHashParams } "thirdweb/extensions/erc4337";
81
+ * const result = encodeGetUserOpHashParams({
82
+ * userOp: ...,
83
+ * });
84
+ * ```
85
+ */
86
+ export function encodeGetUserOpHashParams(options) {
87
+ return encodeAbiParameters(FN_INPUTS, [options.userOp]);
88
+ }
89
+ /**
90
+ * Encodes the "getUserOpHash" function into a Hex string with its parameters.
91
+ * @param options - The options for the getUserOpHash function.
92
+ * @returns The encoded hexadecimal string.
93
+ * @extension ERC4337
94
+ * @example
95
+ * ```ts
96
+ * import { encodeGetUserOpHash } "thirdweb/extensions/erc4337";
97
+ * const result = encodeGetUserOpHash({
98
+ * userOp: ...,
99
+ * });
100
+ * ```
101
+ */
102
+ export function encodeGetUserOpHash(options) {
103
+ // we do a "manual" concat here to avoid the overhead of the "concatHex" function
104
+ // we can do this because we know the specific formats of the values
105
+ return (FN_SELECTOR +
106
+ encodeGetUserOpHashParams(options).slice(2));
107
+ }
108
+ /**
109
+ * Decodes the result of the getUserOpHash function call.
110
+ * @param result - The hexadecimal result to decode.
111
+ * @returns The decoded result as per the FN_OUTPUTS definition.
112
+ * @extension ERC4337
113
+ * @example
114
+ * ```ts
115
+ * import { decodeGetUserOpHashResult } from "thirdweb/extensions/erc4337";
116
+ * const result = decodeGetUserOpHashResult("...");
117
+ * ```
118
+ */
119
+ export function decodeGetUserOpHashResult(result) {
120
+ return decodeAbiParameters(FN_OUTPUTS, result)[0];
121
+ }
122
+ /**
123
+ * Calls the "getUserOpHash" function on the contract.
124
+ * @param options - The options for the getUserOpHash function.
125
+ * @returns The parsed result of the function call.
126
+ * @extension ERC4337
127
+ * @example
128
+ * ```ts
129
+ * import { getUserOpHash } from "thirdweb/extensions/erc4337";
130
+ *
131
+ * const result = await getUserOpHash({
132
+ * contract,
133
+ * userOp: ...,
134
+ * });
135
+ *
136
+ * ```
137
+ */
138
+ export async function getUserOpHash(options) {
139
+ return readContract({
140
+ contract: options.contract,
141
+ method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS],
142
+ params: [options.userOp],
143
+ });
144
+ }
145
+ //# sourceMappingURL=getUserOpHash.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"getUserOpHash.js","sourceRoot":"","sources":["../../../../../../../src/extensions/erc4337/__generated__/IEntryPoint_v07/read/getUserOpHash.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,6CAA6C,CAAC;AAE3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AACtF,OAAO,EAAE,mBAAmB,EAAE,MAAM,MAAM,CAAC;AAG3C,OAAO,EAAE,YAAY,EAAE,MAAM,kDAAkD,CAAC;AAuBhF,MAAM,CAAC,MAAM,WAAW,GAAG,YAAqB,CAAC;AACjD,MAAM,SAAS,GAAG;IAChB;QACE,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACV;gBACE,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,QAAQ;aACf;YACD;gBACE,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,OAAO;aACd;YACD;gBACE,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,UAAU;aACjB;YACD;gBACE,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,UAAU;aACjB;YACD;gBACE,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,kBAAkB;aACzB;YACD;gBACE,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,oBAAoB;aAC3B;YACD;gBACE,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,SAAS;aAChB;YACD;gBACE,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,kBAAkB;aACzB;YACD;gBACE,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,WAAW;aAClB;SACF;KACF;CACO,CAAC;AACX,MAAM,UAAU,GAAG;IACjB;QACE,IAAI,EAAE,SAAS;KAChB;CACO,CAAC;AAEX;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,QAA+B;IAE/B,OAAO,YAAY,CAAC;QAClB,QAAQ;QACR,MAAM,EAAE,CAAC,WAAW,EAAE,SAAS,EAAE,UAAU,CAAU;KACtD,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,yBAAyB,CAAC,OAA4B;IACpE,OAAO,mBAAmB,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;AAC1D,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,mBAAmB,CAAC,OAA4B;IAC9D,iFAAiF;IACjF,oEAAoE;IACpE,OAAO,CAAC,WAAW;QACjB,yBAAyB,CAAC,OAAO,CAAC,CAAC,KAAK,CACtC,CAAC,CACF,CAAqC,CAAC;AAC3C,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,yBAAyB,CAAC,MAAW;IACnD,OAAO,mBAAmB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;AACpD,CAAC;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAAoD;IAEpD,OAAO,YAAY,CAAC;QAClB,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,MAAM,EAAE,CAAC,WAAW,EAAE,SAAS,EAAE,UAAU,CAAU;QACrD,MAAM,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC;KACzB,CAAC,CAAC;AACL,CAAC"}