thirdweb 5.48.2 → 5.48.3-nightly-b661ce7b2fd58e7ff01faf47cf8fb3bb232841ec-20240827000337

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 (112) 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/version.js +1 -1
  13. package/dist/cjs/version.js.map +1 -1
  14. package/dist/cjs/wallets/smart/index.js +13 -2
  15. package/dist/cjs/wallets/smart/index.js.map +1 -1
  16. package/dist/cjs/wallets/smart/lib/bundler.js +11 -2
  17. package/dist/cjs/wallets/smart/lib/bundler.js.map +1 -1
  18. package/dist/cjs/wallets/smart/lib/constants.js +27 -13
  19. package/dist/cjs/wallets/smart/lib/constants.js.map +1 -1
  20. package/dist/cjs/wallets/smart/lib/packUserOp.js +75 -0
  21. package/dist/cjs/wallets/smart/lib/packUserOp.js.map +1 -0
  22. package/dist/cjs/wallets/smart/lib/paymaster.js +11 -1
  23. package/dist/cjs/wallets/smart/lib/paymaster.js.map +1 -1
  24. package/dist/cjs/wallets/smart/lib/userop.js +201 -66
  25. package/dist/cjs/wallets/smart/lib/userop.js.map +1 -1
  26. package/dist/cjs/wallets/smart/lib/utils.js +1 -1
  27. package/dist/cjs/wallets/smart/lib/utils.js.map +1 -1
  28. package/dist/cjs/wallets/smart/smart-wallet.js +2 -1
  29. package/dist/cjs/wallets/smart/smart-wallet.js.map +1 -1
  30. package/dist/cjs/wallets/smart/types.js.map +1 -1
  31. package/dist/esm/exports/wallets/smart.js +1 -1
  32. package/dist/esm/exports/wallets/smart.js.map +1 -1
  33. package/dist/esm/extensions/erc1155/drops/write/claimTo.js.map +1 -1
  34. package/dist/esm/extensions/erc4337/__generated__/IEntryPoint_v07/events/PostOpRevertReason.js +29 -0
  35. package/dist/esm/extensions/erc4337/__generated__/IEntryPoint_v07/events/PostOpRevertReason.js.map +1 -0
  36. package/dist/esm/extensions/erc4337/__generated__/IEntryPoint_v07/read/getUserOpHash.js +145 -0
  37. package/dist/esm/extensions/erc4337/__generated__/IEntryPoint_v07/read/getUserOpHash.js.map +1 -0
  38. package/dist/esm/extensions/prebuilts/__generated__/VoteERC20/write/initialize.js +177 -0
  39. package/dist/esm/extensions/prebuilts/__generated__/VoteERC20/write/initialize.js.map +1 -0
  40. package/dist/esm/extensions/prebuilts/deploy-vote.js +119 -0
  41. package/dist/esm/extensions/prebuilts/deploy-vote.js.map +1 -0
  42. package/dist/esm/version.js +1 -1
  43. package/dist/esm/version.js.map +1 -1
  44. package/dist/esm/wallets/smart/index.js +14 -3
  45. package/dist/esm/wallets/smart/index.js.map +1 -1
  46. package/dist/esm/wallets/smart/lib/bundler.js +12 -3
  47. package/dist/esm/wallets/smart/lib/bundler.js.map +1 -1
  48. package/dist/esm/wallets/smart/lib/constants.js +23 -10
  49. package/dist/esm/wallets/smart/lib/constants.js.map +1 -1
  50. package/dist/esm/wallets/smart/lib/packUserOp.js +65 -0
  51. package/dist/esm/wallets/smart/lib/packUserOp.js.map +1 -0
  52. package/dist/esm/wallets/smart/lib/paymaster.js +12 -2
  53. package/dist/esm/wallets/smart/lib/paymaster.js.map +1 -1
  54. package/dist/esm/wallets/smart/lib/userop.js +202 -67
  55. package/dist/esm/wallets/smart/lib/userop.js.map +1 -1
  56. package/dist/esm/wallets/smart/lib/utils.js +1 -1
  57. package/dist/esm/wallets/smart/lib/utils.js.map +1 -1
  58. package/dist/esm/wallets/smart/smart-wallet.js +3 -2
  59. package/dist/esm/wallets/smart/smart-wallet.js.map +1 -1
  60. package/dist/esm/wallets/smart/types.js.map +1 -1
  61. package/dist/types/exports/wallets/smart.d.ts +2 -2
  62. package/dist/types/exports/wallets/smart.d.ts.map +1 -1
  63. package/dist/types/extensions/erc1155/drops/write/claimTo.d.ts +2 -3
  64. package/dist/types/extensions/erc1155/drops/write/claimTo.d.ts.map +1 -1
  65. package/dist/types/extensions/erc4337/__generated__/IEntryPoint_v07/events/PostOpRevertReason.d.ts +57 -0
  66. package/dist/types/extensions/erc4337/__generated__/IEntryPoint_v07/events/PostOpRevertReason.d.ts.map +1 -0
  67. package/dist/types/extensions/erc4337/__generated__/IEntryPoint_v07/read/getUserOpHash.d.ts +123 -0
  68. package/dist/types/extensions/erc4337/__generated__/IEntryPoint_v07/read/getUserOpHash.d.ts.map +1 -0
  69. package/dist/types/extensions/prebuilts/__generated__/VoteERC20/write/initialize.d.ts +129 -0
  70. package/dist/types/extensions/prebuilts/__generated__/VoteERC20/write/initialize.d.ts.map +1 -0
  71. package/dist/types/extensions/prebuilts/deploy-vote.d.ts +82 -0
  72. package/dist/types/extensions/prebuilts/deploy-vote.d.ts.map +1 -0
  73. package/dist/types/version.d.ts +1 -1
  74. package/dist/types/version.d.ts.map +1 -1
  75. package/dist/types/wallets/smart/index.d.ts.map +1 -1
  76. package/dist/types/wallets/smart/lib/bundler.d.ts +3 -3
  77. package/dist/types/wallets/smart/lib/bundler.d.ts.map +1 -1
  78. package/dist/types/wallets/smart/lib/constants.d.ts +6 -6
  79. package/dist/types/wallets/smart/lib/constants.d.ts.map +1 -1
  80. package/dist/types/wallets/smart/lib/packUserOp.d.ts +16 -0
  81. package/dist/types/wallets/smart/lib/packUserOp.d.ts.map +1 -0
  82. package/dist/types/wallets/smart/lib/paymaster.d.ts +3 -3
  83. package/dist/types/wallets/smart/lib/paymaster.d.ts.map +1 -1
  84. package/dist/types/wallets/smart/lib/userop.d.ts +6 -4
  85. package/dist/types/wallets/smart/lib/userop.d.ts.map +1 -1
  86. package/dist/types/wallets/smart/lib/utils.d.ts +2 -2
  87. package/dist/types/wallets/smart/lib/utils.d.ts.map +1 -1
  88. package/dist/types/wallets/smart/smart-wallet.d.ts.map +1 -1
  89. package/dist/types/wallets/smart/types.d.ts +62 -9
  90. package/dist/types/wallets/smart/types.d.ts.map +1 -1
  91. package/package.json +1 -1
  92. package/src/exports/wallets/smart.ts +4 -2
  93. package/src/extensions/erc1155/drops/write/claimTo.ts +2 -3
  94. package/src/extensions/erc4337/__generated__/IEntryPoint_v07/events/PostOpRevertReason.ts +49 -0
  95. package/src/extensions/erc4337/__generated__/IEntryPoint_v07/read/getUserOpHash.ts +181 -0
  96. package/src/extensions/prebuilts/__generated__/VoteERC20/write/initialize.ts +230 -0
  97. package/src/extensions/prebuilts/deploy-vote.test.ts +73 -0
  98. package/src/extensions/prebuilts/deploy-vote.ts +213 -0
  99. package/src/extensions/vote/read/proposalExists.test.ts +123 -0
  100. package/src/version.ts +1 -1
  101. package/src/wallets/smart/index.ts +21 -5
  102. package/src/wallets/smart/lib/bundler.ts +21 -5
  103. package/src/wallets/smart/lib/constants.ts +29 -10
  104. package/src/wallets/smart/lib/packUserOp.ts +79 -0
  105. package/src/wallets/smart/lib/paymaster.ts +22 -5
  106. package/src/wallets/smart/lib/userop.ts +292 -85
  107. package/src/wallets/smart/lib/utils.ts +11 -4
  108. package/src/wallets/smart/smart-wallet-integration-v07.test.ts +206 -0
  109. package/src/wallets/smart/smart-wallet-integration.test.ts +1 -1
  110. package/src/wallets/smart/smart-wallet-zksync.test.ts +1 -2
  111. package/src/wallets/smart/smart-wallet.ts +4 -2
  112. package/src/wallets/smart/types.ts +73 -9
@@ -10,6 +10,7 @@ exports.broadcastZkTransaction = broadcastZkTransaction;
10
10
  const viem_1 = require("viem");
11
11
  const parse_logs_js_1 = require("../../../event/actions/parse-logs.js");
12
12
  const UserOperationRevertReason_js_1 = require("../../../extensions/erc4337/__generated__/IEntryPoint/events/UserOperationRevertReason.js");
13
+ const PostOpRevertReason_js_1 = require("../../../extensions/erc4337/__generated__/IEntryPoint_v07/events/PostOpRevertReason.js");
13
14
  const hex_js_1 = require("../../../utils/encoding/hex.js");
14
15
  const fetch_js_1 = require("../../../utils/fetch.js");
15
16
  const json_js_1 = require("../../../utils/json.js");
@@ -71,6 +72,12 @@ async function estimateUserOpGas(args) {
71
72
  verificationGas: (0, hex_js_1.hexToBigInt)(res.verificationGas),
72
73
  verificationGasLimit: (0, hex_js_1.hexToBigInt)(res.verificationGasLimit),
73
74
  callGasLimit: (0, hex_js_1.hexToBigInt)(res.callGasLimit) + constants_js_1.MANAGED_ACCOUNT_GAS_BUFFER,
75
+ paymasterVerificationGasLimit: res.paymasterVerificationGasLimit !== undefined
76
+ ? (0, hex_js_1.hexToBigInt)(res.paymasterVerificationGasLimit)
77
+ : undefined,
78
+ paymasterPostOpGasLimit: res.paymasterPostOpGasLimit !== undefined
79
+ ? (0, hex_js_1.hexToBigInt)(res.paymasterPostOpGasLimit)
80
+ : undefined,
74
81
  };
75
82
  }
76
83
  /**
@@ -122,7 +129,7 @@ async function getUserOpReceipt(args) {
122
129
  if (res.success === false) {
123
130
  // parse revert reason
124
131
  const logs = (0, parse_logs_js_1.parseEventLogs)({
125
- events: [(0, UserOperationRevertReason_js_1.userOperationRevertReasonEvent)()],
132
+ events: [(0, UserOperationRevertReason_js_1.userOperationRevertReasonEvent)(), (0, PostOpRevertReason_js_1.postOpRevertReasonEvent)()],
126
133
  logs: res.logs,
127
134
  });
128
135
  const revertReason = logs[0]?.args?.revertReason;
@@ -197,7 +204,9 @@ async function sendBundlerRequest(args) {
197
204
  if (constants_js_1.DEBUG) {
198
205
  console.debug(`>>> sending ${operation} with payload:`, params);
199
206
  }
200
- const bundlerUrl = options.bundlerUrl ?? (0, constants_js_1.getDefaultBundlerUrl)(options.chain);
207
+ const entryPointVersion = (0, constants_js_1.getEntryPointVersion)(options.entrypointAddress || constants_js_1.ENTRYPOINT_ADDRESS_v0_6);
208
+ const bundlerVersion = entryPointVersion === "v0.6" ? "v1" : "v2";
209
+ const bundlerUrl = options.bundlerUrl ?? (0, constants_js_1.getDefaultBundlerUrl)(options.chain, bundlerVersion);
201
210
  const fetchWithHeaders = (0, fetch_js_1.getClientFetch)(options.client);
202
211
  const response = await fetchWithHeaders(bundlerUrl, {
203
212
  method: "POST",
@@ -1 +1 @@
1
- {"version":3,"file":"bundler.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/bundler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"bundler.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/bundler.ts"],"names":[],"mappings":"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"}
@@ -1,33 +1,47 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getDefaultPaymasterUrl = exports.getDefaultBundlerUrl = exports.MANAGED_ACCOUNT_GAS_BUFFER = exports.ENTRYPOINT_ADDRESS_v0_6 = exports.DEFAULT_ACCOUNT_FACTORY = exports.DUMMY_SIGNATURE = exports.DEBUG = void 0;
3
+ exports.getEntryPointVersion = exports.getDefaultBundlerUrl = exports.getDefaultAccountFactory = exports.MANAGED_ACCOUNT_GAS_BUFFER = exports.ENTRYPOINT_ADDRESS_v0_7 = exports.ENTRYPOINT_ADDRESS_v0_6 = exports.DEFAULT_ACCOUNT_FACTORY_V0_7 = exports.DEFAULT_ACCOUNT_FACTORY_V0_6 = exports.DUMMY_SIGNATURE = exports.DEBUG = void 0;
4
+ const address_js_1 = require("../../../utils/address.js");
4
5
  const domains_js_1 = require("../../../utils/domains.js");
5
6
  // dev only
6
7
  exports.DEBUG = false;
7
8
  exports.DUMMY_SIGNATURE = "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c";
8
- exports.DEFAULT_ACCOUNT_FACTORY = "0x85e23b94e7F5E9cC1fF78BCe78cfb15B81f0DF00";
9
+ exports.DEFAULT_ACCOUNT_FACTORY_V0_6 = "0x85e23b94e7F5E9cC1fF78BCe78cfb15B81f0DF00";
10
+ exports.DEFAULT_ACCOUNT_FACTORY_V0_7 = "0x4be0ddfebca9a5a4a617dee4dece99e7c862dceb";
9
11
  exports.ENTRYPOINT_ADDRESS_v0_6 = "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789"; // v0.6
12
+ exports.ENTRYPOINT_ADDRESS_v0_7 = "0x0000000071727De22E5E9d8BAf0edAc6f37da032"; // v0.7
10
13
  exports.MANAGED_ACCOUNT_GAS_BUFFER = 50000n;
11
- /**
14
+ /*
12
15
  * @internal
13
16
  */
14
- const getDefaultBundlerUrl = (chain) => {
15
- const domain = (0, domains_js_1.getThirdwebDomains)().bundler;
16
- if (domain.startsWith("localhost:")) {
17
- return `http://${domain}?chain=${chain.id}`;
17
+ const getDefaultAccountFactory = (entryPointAddress) => {
18
+ const version = (0, exports.getEntryPointVersion)(entryPointAddress || exports.ENTRYPOINT_ADDRESS_v0_6);
19
+ if (version === "v0.7") {
20
+ return exports.DEFAULT_ACCOUNT_FACTORY_V0_7;
18
21
  }
19
- return `https://${chain.id}.${domain}/`;
22
+ return exports.DEFAULT_ACCOUNT_FACTORY_V0_6;
20
23
  };
21
- exports.getDefaultBundlerUrl = getDefaultBundlerUrl;
24
+ exports.getDefaultAccountFactory = getDefaultAccountFactory;
22
25
  /**
23
26
  * @internal
24
27
  */
25
- const getDefaultPaymasterUrl = (chain) => {
28
+ const getDefaultBundlerUrl = (chain, version) => {
26
29
  const domain = (0, domains_js_1.getThirdwebDomains)().bundler;
27
30
  if (domain.startsWith("localhost:")) {
28
- return `http://${domain}?chain=${chain.id}`;
31
+ return `http://${domain}/${version ?? "v1"}?chain=${chain.id}`;
32
+ }
33
+ return `https://${chain.id}.${domain}/${version ?? "v1"}`;
34
+ };
35
+ exports.getDefaultBundlerUrl = getDefaultBundlerUrl;
36
+ const getEntryPointVersion = (address) => {
37
+ const checksummedAddress = (0, address_js_1.getAddress)(address);
38
+ if (checksummedAddress === exports.ENTRYPOINT_ADDRESS_v0_6) {
39
+ return "v0.6";
40
+ }
41
+ if (checksummedAddress === exports.ENTRYPOINT_ADDRESS_v0_7) {
42
+ return "v0.7";
29
43
  }
30
- return `https://${chain.id}.${domain}/`;
44
+ throw new Error("Unknown paymaster version");
31
45
  };
32
- exports.getDefaultPaymasterUrl = getDefaultPaymasterUrl;
46
+ exports.getEntryPointVersion = getEntryPointVersion;
33
47
  //# sourceMappingURL=constants.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/constants.ts"],"names":[],"mappings":";;;AACA,0DAA+D;AAE/D,WAAW;AACE,QAAA,KAAK,GAAG,KAAK,CAAC;AAEd,QAAA,eAAe,GAC1B,sIAAsI,CAAC;AAE5H,QAAA,uBAAuB,GAClC,4CAA4C,CAAC;AAElC,QAAA,uBAAuB,GAClC,4CAA4C,CAAC,CAAC,OAAO;AAC1C,QAAA,0BAA0B,GAAG,MAAM,CAAC;AAEjD;;GAEG;AACI,MAAM,oBAAoB,GAAG,CAAC,KAAY,EAAE,EAAE;IACnD,MAAM,MAAM,GAAG,IAAA,+BAAkB,GAAE,CAAC,OAAO,CAAC;IAC5C,IAAI,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QACpC,OAAO,UAAU,MAAM,UAAU,KAAK,CAAC,EAAE,EAAE,CAAC;IAC9C,CAAC;IACD,OAAO,WAAW,KAAK,CAAC,EAAE,IAAI,MAAM,GAAG,CAAC;AAC1C,CAAC,CAAC;AANW,QAAA,oBAAoB,wBAM/B;AAEF;;GAEG;AACI,MAAM,sBAAsB,GAAG,CAAC,KAAY,EAAE,EAAE;IACrD,MAAM,MAAM,GAAG,IAAA,+BAAkB,GAAE,CAAC,OAAO,CAAC;IAC5C,IAAI,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QACpC,OAAO,UAAU,MAAM,UAAU,KAAK,CAAC,EAAE,EAAE,CAAC;IAC9C,CAAC;IACD,OAAO,WAAW,KAAK,CAAC,EAAE,IAAI,MAAM,GAAG,CAAC;AAC1C,CAAC,CAAC;AANW,QAAA,sBAAsB,0BAMjC"}
1
+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/constants.ts"],"names":[],"mappings":";;;AACA,0DAAuD;AACvD,0DAA+D;AAE/D,WAAW;AACE,QAAA,KAAK,GAAG,KAAK,CAAC;AAEd,QAAA,eAAe,GAC1B,sIAAsI,CAAC;AAE5H,QAAA,4BAA4B,GACvC,4CAA4C,CAAC;AAClC,QAAA,4BAA4B,GACvC,4CAA4C,CAAC;AAElC,QAAA,uBAAuB,GAClC,4CAA4C,CAAC,CAAC,OAAO;AAC1C,QAAA,uBAAuB,GAClC,4CAA4C,CAAC,CAAC,OAAO;AAE1C,QAAA,0BAA0B,GAAG,MAAM,CAAC;AAEjD;;GAEG;AACI,MAAM,wBAAwB,GAAG,CAAC,iBAA0B,EAAE,EAAE;IACrE,MAAM,OAAO,GAAG,IAAA,4BAAoB,EAClC,iBAAiB,IAAI,+BAAuB,CAC7C,CAAC;IACF,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;QACvB,OAAO,oCAA4B,CAAC;IACtC,CAAC;IACD,OAAO,oCAA4B,CAAC;AACtC,CAAC,CAAC;AARW,QAAA,wBAAwB,4BAQnC;AAEF;;GAEG;AACI,MAAM,oBAAoB,GAAG,CAAC,KAAY,EAAE,OAAoB,EAAE,EAAE;IACzE,MAAM,MAAM,GAAG,IAAA,+BAAkB,GAAE,CAAC,OAAO,CAAC;IAC5C,IAAI,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QACpC,OAAO,UAAU,MAAM,IAAI,OAAO,IAAI,IAAI,UAAU,KAAK,CAAC,EAAE,EAAE,CAAC;IACjE,CAAC;IACD,OAAO,WAAW,KAAK,CAAC,EAAE,IAAI,MAAM,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;AAC5D,CAAC,CAAC;AANW,QAAA,oBAAoB,wBAM/B;AAEK,MAAM,oBAAoB,GAAG,CAAC,OAAe,EAAmB,EAAE;IACvE,MAAM,kBAAkB,GAAG,IAAA,uBAAU,EAAC,OAAO,CAAC,CAAC;IAC/C,IAAI,kBAAkB,KAAK,+BAAuB,EAAE,CAAC;QACnD,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,IAAI,kBAAkB,KAAK,+BAAuB,EAAE,CAAC;QACnD,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;AAC/C,CAAC,CAAC;AATW,QAAA,oBAAoB,wBAS/B"}
@@ -0,0 +1,75 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.getPackedUserOperation = void 0;
4
+ exports.getInitCode = getInitCode;
5
+ exports.getAccountGasLimits = getAccountGasLimits;
6
+ exports.unpackAccountGasLimits = unpackAccountGasLimits;
7
+ exports.getGasLimits = getGasLimits;
8
+ exports.unpackGasLimits = unpackGasLimits;
9
+ exports.getPaymasterAndData = getPaymasterAndData;
10
+ const viem_1 = require("viem");
11
+ function getInitCode(unpackedUserOperation) {
12
+ return unpackedUserOperation.factory
13
+ ? (0, viem_1.concat)([
14
+ unpackedUserOperation.factory,
15
+ unpackedUserOperation.factoryData || "0x",
16
+ ])
17
+ : "0x";
18
+ }
19
+ function getAccountGasLimits(unpackedUserOperation) {
20
+ return (0, viem_1.concat)([
21
+ (0, viem_1.pad)((0, viem_1.toHex)(unpackedUserOperation.verificationGasLimit), {
22
+ size: 16,
23
+ }),
24
+ (0, viem_1.pad)((0, viem_1.toHex)(unpackedUserOperation.callGasLimit), { size: 16 }),
25
+ ]);
26
+ }
27
+ function unpackAccountGasLimits(accountGasLimits) {
28
+ return {
29
+ verificationGasLimit: BigInt((0, viem_1.slice)(accountGasLimits, 0, 16)),
30
+ callGasLimit: BigInt((0, viem_1.slice)(accountGasLimits, 16)),
31
+ };
32
+ }
33
+ function getGasLimits(unpackedUserOperation) {
34
+ return (0, viem_1.concat)([
35
+ (0, viem_1.pad)((0, viem_1.toHex)(unpackedUserOperation.maxPriorityFeePerGas), {
36
+ size: 16,
37
+ }),
38
+ (0, viem_1.pad)((0, viem_1.toHex)(unpackedUserOperation.maxFeePerGas), { size: 16 }),
39
+ ]);
40
+ }
41
+ function unpackGasLimits(gasLimits) {
42
+ return {
43
+ maxPriorityFeePerGas: BigInt((0, viem_1.slice)(gasLimits, 0, 16)),
44
+ maxFeePerGas: BigInt((0, viem_1.slice)(gasLimits, 16)),
45
+ };
46
+ }
47
+ function getPaymasterAndData(unpackedUserOperation) {
48
+ return unpackedUserOperation.paymaster
49
+ ? (0, viem_1.concat)([
50
+ unpackedUserOperation.paymaster,
51
+ (0, viem_1.pad)((0, viem_1.toHex)(unpackedUserOperation.paymasterVerificationGasLimit || BigInt(0)), {
52
+ size: 16,
53
+ }),
54
+ (0, viem_1.pad)((0, viem_1.toHex)(unpackedUserOperation.paymasterPostOpGasLimit || BigInt(0)), {
55
+ size: 16,
56
+ }),
57
+ unpackedUserOperation.paymasterData || "0x",
58
+ ])
59
+ : "0x";
60
+ }
61
+ const getPackedUserOperation = (userOperation) => {
62
+ return {
63
+ sender: userOperation.sender,
64
+ nonce: userOperation.nonce,
65
+ initCode: getInitCode(userOperation),
66
+ callData: userOperation.callData,
67
+ accountGasLimits: getAccountGasLimits(userOperation),
68
+ preVerificationGas: userOperation.preVerificationGas,
69
+ gasFees: getGasLimits(userOperation),
70
+ paymasterAndData: getPaymasterAndData(userOperation),
71
+ signature: userOperation.signature,
72
+ };
73
+ };
74
+ exports.getPackedUserOperation = getPackedUserOperation;
75
+ //# sourceMappingURL=packUserOp.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"packUserOp.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/packUserOp.ts"],"names":[],"mappings":"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"}
@@ -31,8 +31,10 @@ async function getPaymasterAndData(args) {
31
31
  const headers = {
32
32
  "Content-Type": "application/json",
33
33
  };
34
- const paymasterUrl = (0, constants_js_1.getDefaultPaymasterUrl)(chain);
35
34
  const entrypoint = entrypointAddress ?? constants_js_1.ENTRYPOINT_ADDRESS_v0_6;
35
+ const entrypointVersion = (0, constants_js_1.getEntryPointVersion)(entrypoint);
36
+ const paymasterVersion = entrypointVersion === "v0.6" ? "v1" : "v2";
37
+ const paymasterUrl = (0, constants_js_1.getDefaultBundlerUrl)(chain, paymasterVersion);
36
38
  // Ask the paymaster to sign the transaction and return a valid paymasterAndData value.
37
39
  const fetchWithHeaders = (0, fetch_js_1.getClientFetch)(client);
38
40
  const response = await fetchWithHeaders(paymasterUrl, {
@@ -74,6 +76,14 @@ Code: ${code}`);
74
76
  callGasLimit: res.result.callGasLimit
75
77
  ? (0, hex_js_1.hexToBigInt)(res.result.callGasLimit)
76
78
  : undefined,
79
+ paymaster: res.result.paymaster,
80
+ paymasterData: res.result.paymasterData,
81
+ paymasterVerificationGasLimit: res.result.paymasterVerificationGasLimit
82
+ ? (0, hex_js_1.hexToBigInt)(res.result.paymasterVerificationGasLimit)
83
+ : undefined,
84
+ paymasterPostOpGasLimit: res.result.paymasterPostOpGasLimit
85
+ ? (0, hex_js_1.hexToBigInt)(res.result.paymasterPostOpGasLimit)
86
+ : undefined,
77
87
  };
78
88
  }
79
89
  const error = res.error?.message || res.error || response.statusText || "unknown error";
@@ -1 +1 @@
1
- {"version":3,"file":"paymaster.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/paymaster.ts"],"names":[],"mappings":";;AA8BA,kDAwEC;AApGD,2DAA6D;AAC7D,sDAAyD;AAEzD,iDAIwB;AACxB,yCAA2C;AAE3C;;;;;;;;;;;;;;;;;GAiBG;AACI,KAAK,UAAU,mBAAmB,CAAC,IAMzC;IACC,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC;IAE7E,IAAI,iBAAiB,EAAE,CAAC;QACtB,OAAO,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;IAED,MAAM,OAAO,GAA2B;QACtC,cAAc,EAAE,kBAAkB;KACnC,CAAC;IAEF,MAAM,YAAY,GAAG,IAAA,qCAAsB,EAAC,KAAK,CAAC,CAAC;IACnD,MAAM,UAAU,GAAG,iBAAiB,IAAI,sCAAuB,CAAC;IAEhE,uFAAuF;IACvF,MAAM,gBAAgB,GAAG,IAAA,yBAAc,EAAC,MAAM,CAAC,CAAC;IAChD,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,YAAY,EAAE;QACpD,MAAM,EAAE,MAAM;QACd,OAAO;QACP,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;YACnB,OAAO,EAAE,KAAK;YACd,EAAE,EAAE,CAAC;YACL,MAAM,EAAE,yBAAyB;YACjC,MAAM,EAAE,CAAC,IAAA,wBAAa,EAAC,MAAM,CAAC,EAAE,UAAU,CAAC;SAC5C,CAAC;KACH,CAAC,CAAC;IACH,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IAElC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,IAAI,QAAQ,CAAC,UAAU,CAAC;QAC/C,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,IAAI,SAAS,CAAC;QAEnC,MAAM,IAAI,KAAK,CACb,oBAAoB,KAAK;UACrB,QAAQ,CAAC,MAAM;QACjB,IAAI,EAAE,CACT,CAAC;IACJ,CAAC;IAED,IAAI,oBAAK,EAAE,CAAC;QACV,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;IAC1C,CAAC;IAED,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;QACf,wEAAwE;QACxE,IAAI,OAAO,GAAG,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YACnC,OAAO;gBACL,gBAAgB,EAAE,GAAG,CAAC,MAAM;aAC7B,CAAC;QACJ,CAAC;QACD,OAAO;YACL,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,gBAAgB;YAC7C,oBAAoB,EAAE,GAAG,CAAC,MAAM,CAAC,oBAAoB;gBACnD,CAAC,CAAC,IAAA,oBAAW,EAAC,GAAG,CAAC,MAAM,CAAC,oBAAoB,CAAC;gBAC9C,CAAC,CAAC,SAAS;YACb,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,kBAAkB;gBAC/C,CAAC,CAAC,IAAA,oBAAW,EAAC,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC;gBAC5C,CAAC,CAAC,SAAS;YACb,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,YAAY;gBACnC,CAAC,CAAC,IAAA,oBAAW,EAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC;gBACtC,CAAC,CAAC,SAAS;SACd,CAAC;IACJ,CAAC;IACD,MAAM,KAAK,GACT,GAAG,CAAC,KAAK,EAAE,OAAO,IAAI,GAAG,CAAC,KAAK,IAAI,QAAQ,CAAC,UAAU,IAAI,eAAe,CAAC;IAC5E,MAAM,IAAI,KAAK,CAAC,wBAAwB,YAAY,KAAK,KAAK,EAAE,CAAC,CAAC;AACpE,CAAC"}
1
+ {"version":3,"file":"paymaster.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/paymaster.ts"],"names":[],"mappings":"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"}
@@ -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) {