thirdweb 5.34.0-nightly-f6ff5a78fc2d65f0f250b154f1405210ca57ce0a-20240708000345 → 5.34.0-nightly-95c9d3d92406de619cb1e4cccc61b0766dd2a0d4-20240708205331

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 (186) hide show
  1. package/dist/cjs/auth/core/verify-jwt.js +1 -1
  2. package/dist/cjs/auth/core/verify-jwt.js.map +1 -1
  3. package/dist/cjs/auth/verify-hash.js +98 -0
  4. package/dist/cjs/auth/verify-hash.js.map +1 -0
  5. package/dist/cjs/auth/verify-signature.js +5 -60
  6. package/dist/cjs/auth/verify-signature.js.map +1 -1
  7. package/dist/cjs/auth/verify-typed-data.js +80 -0
  8. package/dist/cjs/auth/verify-typed-data.js.map +1 -0
  9. package/dist/cjs/chains/chain-definitions/blast.js +17 -0
  10. package/dist/cjs/chains/chain-definitions/blast.js.map +1 -0
  11. package/dist/cjs/exports/chains.js +3 -1
  12. package/dist/cjs/exports/chains.js.map +1 -1
  13. package/dist/cjs/exports/extensions/erc20.js +3 -1
  14. package/dist/cjs/exports/extensions/erc20.js.map +1 -1
  15. package/dist/cjs/exports/utils.js +10 -1
  16. package/dist/cjs/exports/utils.js.map +1 -1
  17. package/dist/cjs/exports/wallets/smart.js +10 -1
  18. package/dist/cjs/exports/wallets/smart.js.map +1 -1
  19. package/dist/cjs/extensions/erc1271/checkContractWalletSignature.js +1 -0
  20. package/dist/cjs/extensions/erc1271/checkContractWalletSignature.js.map +1 -1
  21. package/dist/cjs/extensions/erc1271/checkContractWalletSignedTypedData.js +1 -0
  22. package/dist/cjs/extensions/erc1271/checkContractWalletSignedTypedData.js.map +1 -1
  23. package/dist/cjs/extensions/erc20/write/transferBatch.js +61 -0
  24. package/dist/cjs/extensions/erc20/write/transferBatch.js.map +1 -0
  25. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.js +21 -12
  26. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.js.map +1 -1
  27. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/PayWIthCreditCard.js +1 -1
  28. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatSteps.js +4 -4
  29. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatTxDetailsTable.js +1 -1
  30. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/main/useBuyTxStates.js +1 -3
  31. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/main/useBuyTxStates.js.map +1 -1
  32. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/main/useUISelectionStates.js +1 -4
  33. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/main/useUISelectionStates.js.map +1 -1
  34. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.js +1 -1
  35. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/Fees.js +4 -4
  36. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/PayWithCrypto.js +1 -1
  37. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/tx-history/BuyTxHistoryButton.js +1 -1
  38. package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/tx-history/TokenInfoRow.js +1 -1
  39. package/dist/cjs/utils/hashing/hashTypedData.js +122 -0
  40. package/dist/cjs/utils/hashing/hashTypedData.js.map +1 -0
  41. package/dist/cjs/utils/jwt/decode-jwt.js +2 -2
  42. package/dist/cjs/utils/jwt/decode-jwt.js.map +1 -1
  43. package/dist/cjs/utils/jwt/refresh-jwt.js +1 -1
  44. package/dist/cjs/utils/jwt/refresh-jwt.js.map +1 -1
  45. package/dist/cjs/version.js +1 -1
  46. package/dist/cjs/wallets/smart/index.js +19 -9
  47. package/dist/cjs/wallets/smart/index.js.map +1 -1
  48. package/dist/cjs/wallets/smart/lib/bundler.js +57 -9
  49. package/dist/cjs/wallets/smart/lib/bundler.js.map +1 -1
  50. package/dist/cjs/wallets/smart/lib/calls.js +31 -21
  51. package/dist/cjs/wallets/smart/lib/calls.js.map +1 -1
  52. package/dist/cjs/wallets/smart/lib/paymaster.js +5 -6
  53. package/dist/cjs/wallets/smart/lib/paymaster.js.map +1 -1
  54. package/dist/cjs/wallets/smart/lib/userop.js +45 -21
  55. package/dist/cjs/wallets/smart/lib/userop.js.map +1 -1
  56. package/dist/esm/auth/core/verify-jwt.js +2 -2
  57. package/dist/esm/auth/core/verify-jwt.js.map +1 -1
  58. package/dist/esm/auth/verify-hash.js +95 -0
  59. package/dist/esm/auth/verify-hash.js.map +1 -0
  60. package/dist/esm/auth/verify-signature.js +6 -61
  61. package/dist/esm/auth/verify-signature.js.map +1 -1
  62. package/dist/esm/auth/verify-typed-data.js +77 -0
  63. package/dist/esm/auth/verify-typed-data.js.map +1 -0
  64. package/dist/esm/chains/chain-definitions/blast.js +14 -0
  65. package/dist/esm/chains/chain-definitions/blast.js.map +1 -0
  66. package/dist/esm/exports/chains.js +1 -0
  67. package/dist/esm/exports/chains.js.map +1 -1
  68. package/dist/esm/exports/extensions/erc20.js +1 -0
  69. package/dist/esm/exports/extensions/erc20.js.map +1 -1
  70. package/dist/esm/exports/utils.js +6 -0
  71. package/dist/esm/exports/utils.js.map +1 -1
  72. package/dist/esm/exports/wallets/smart.js +3 -1
  73. package/dist/esm/exports/wallets/smart.js.map +1 -1
  74. package/dist/esm/extensions/erc1271/checkContractWalletSignature.js +1 -0
  75. package/dist/esm/extensions/erc1271/checkContractWalletSignature.js.map +1 -1
  76. package/dist/esm/extensions/erc1271/checkContractWalletSignedTypedData.js +1 -0
  77. package/dist/esm/extensions/erc1271/checkContractWalletSignedTypedData.js.map +1 -1
  78. package/dist/esm/extensions/erc20/write/transferBatch.js +58 -0
  79. package/dist/esm/extensions/erc20/write/transferBatch.js.map +1 -0
  80. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.js +21 -12
  81. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.js.map +1 -1
  82. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/PayWIthCreditCard.js +1 -1
  83. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatSteps.js +4 -4
  84. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatTxDetailsTable.js +1 -1
  85. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/main/useBuyTxStates.js +1 -3
  86. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/main/useBuyTxStates.js.map +1 -1
  87. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/main/useUISelectionStates.js +1 -4
  88. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/main/useUISelectionStates.js.map +1 -1
  89. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.js +1 -1
  90. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/Fees.js +4 -4
  91. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/PayWithCrypto.js +1 -1
  92. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/tx-history/BuyTxHistoryButton.js +1 -1
  93. package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/tx-history/TokenInfoRow.js +1 -1
  94. package/dist/esm/utils/hashing/hashTypedData.js +118 -0
  95. package/dist/esm/utils/hashing/hashTypedData.js.map +1 -0
  96. package/dist/esm/utils/jwt/decode-jwt.js +1 -1
  97. package/dist/esm/utils/jwt/decode-jwt.js.map +1 -1
  98. package/dist/esm/utils/jwt/refresh-jwt.js +2 -2
  99. package/dist/esm/utils/jwt/refresh-jwt.js.map +1 -1
  100. package/dist/esm/version.js +1 -1
  101. package/dist/esm/wallets/smart/index.js +19 -9
  102. package/dist/esm/wallets/smart/index.js.map +1 -1
  103. package/dist/esm/wallets/smart/lib/bundler.js +56 -8
  104. package/dist/esm/wallets/smart/lib/bundler.js.map +1 -1
  105. package/dist/esm/wallets/smart/lib/calls.js +31 -21
  106. package/dist/esm/wallets/smart/lib/calls.js.map +1 -1
  107. package/dist/esm/wallets/smart/lib/paymaster.js +5 -6
  108. package/dist/esm/wallets/smart/lib/paymaster.js.map +1 -1
  109. package/dist/esm/wallets/smart/lib/userop.js +46 -22
  110. package/dist/esm/wallets/smart/lib/userop.js.map +1 -1
  111. package/dist/types/auth/verify-hash.d.ts +45 -0
  112. package/dist/types/auth/verify-hash.d.ts.map +1 -0
  113. package/dist/types/auth/verify-signature.d.ts.map +1 -1
  114. package/dist/types/auth/verify-typed-data.d.ts +75 -0
  115. package/dist/types/auth/verify-typed-data.d.ts.map +1 -0
  116. package/dist/types/chains/chain-definitions/blast.d.ts +27 -0
  117. package/dist/types/chains/chain-definitions/blast.d.ts.map +1 -0
  118. package/dist/types/exports/chains.d.ts +1 -0
  119. package/dist/types/exports/chains.d.ts.map +1 -1
  120. package/dist/types/exports/extensions/erc20.d.ts +1 -0
  121. package/dist/types/exports/extensions/erc20.d.ts.map +1 -1
  122. package/dist/types/exports/utils.d.ts +4 -0
  123. package/dist/types/exports/utils.d.ts.map +1 -1
  124. package/dist/types/exports/wallets/smart.d.ts +3 -1
  125. package/dist/types/exports/wallets/smart.d.ts.map +1 -1
  126. package/dist/types/extensions/erc1271/checkContractWalletSignature.d.ts +1 -0
  127. package/dist/types/extensions/erc1271/checkContractWalletSignature.d.ts.map +1 -1
  128. package/dist/types/extensions/erc1271/checkContractWalletSignedTypedData.d.ts +1 -0
  129. package/dist/types/extensions/erc1271/checkContractWalletSignedTypedData.d.ts.map +1 -1
  130. package/dist/types/extensions/erc20/write/transferBatch.d.ts +42 -0
  131. package/dist/types/extensions/erc20/write/transferBatch.d.ts.map +1 -0
  132. package/dist/types/react/web/ui/ConnectWallet/screens/Buy/main/useBuyTxStates.d.ts.map +1 -1
  133. package/dist/types/react/web/ui/ConnectWallet/screens/Buy/main/useUISelectionStates.d.ts.map +1 -1
  134. package/dist/types/utils/hashing/hashTypedData.d.ts +17 -0
  135. package/dist/types/utils/hashing/hashTypedData.d.ts.map +1 -0
  136. package/dist/types/utils/jwt/decode-jwt.d.ts +1 -1
  137. package/dist/types/utils/jwt/decode-jwt.d.ts.map +1 -1
  138. package/dist/types/version.d.ts +1 -1
  139. package/dist/types/wallets/smart/index.d.ts.map +1 -1
  140. package/dist/types/wallets/smart/lib/bundler.d.ts +53 -5
  141. package/dist/types/wallets/smart/lib/bundler.d.ts.map +1 -1
  142. package/dist/types/wallets/smart/lib/calls.d.ts +25 -7
  143. package/dist/types/wallets/smart/lib/calls.d.ts.map +1 -1
  144. package/dist/types/wallets/smart/lib/paymaster.d.ts +7 -2
  145. package/dist/types/wallets/smart/lib/paymaster.d.ts.map +1 -1
  146. package/dist/types/wallets/smart/lib/userop.d.ts +15 -4
  147. package/dist/types/wallets/smart/lib/userop.d.ts.map +1 -1
  148. package/dist/types/wallets/smart/types.d.ts +4 -2
  149. package/dist/types/wallets/smart/types.d.ts.map +1 -1
  150. package/package.json +1 -1
  151. package/src/auth/core/verify-jwt.ts +2 -2
  152. package/src/auth/verify-hash.test.ts +66 -0
  153. package/src/auth/verify-hash.ts +126 -0
  154. package/src/auth/verify-signature.ts +6 -77
  155. package/src/auth/verify-typed-data.test.ts +82 -0
  156. package/src/auth/verify-typed-data.ts +110 -0
  157. package/src/chains/chain-definitions/blast.ts +14 -0
  158. package/src/exports/chains.ts +1 -0
  159. package/src/exports/extensions/erc20.ts +4 -0
  160. package/src/exports/utils.ts +8 -0
  161. package/src/exports/wallets/smart.ts +14 -1
  162. package/src/extensions/erc1271/checkContractWalletSignature.ts +1 -0
  163. package/src/extensions/erc1271/checkContractWalletSignedTypedData.ts +1 -0
  164. package/src/extensions/erc20/write/transferBatch.ts +78 -0
  165. package/src/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.tsx +42 -12
  166. package/src/react/web/ui/ConnectWallet/screens/Buy/PayWIthCreditCard.tsx +1 -1
  167. package/src/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatSteps.tsx +5 -5
  168. package/src/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatTxDetailsTable.tsx +1 -1
  169. package/src/react/web/ui/ConnectWallet/screens/Buy/main/useBuyTxStates.ts +1 -5
  170. package/src/react/web/ui/ConnectWallet/screens/Buy/main/useUISelectionStates.ts +1 -6
  171. package/src/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.tsx +2 -2
  172. package/src/react/web/ui/ConnectWallet/screens/Buy/swap/Fees.tsx +4 -4
  173. package/src/react/web/ui/ConnectWallet/screens/Buy/swap/PayWithCrypto.tsx +1 -1
  174. package/src/react/web/ui/ConnectWallet/screens/Buy/tx-history/BuyTxHistoryButton.tsx +1 -1
  175. package/src/react/web/ui/ConnectWallet/screens/Buy/tx-history/TokenInfoRow.tsx +1 -1
  176. package/src/utils/hashing/hashTypedData.test.ts +207 -0
  177. package/src/utils/hashing/hashTypedData.ts +210 -0
  178. package/src/utils/jwt/decode-jwt.ts +1 -1
  179. package/src/utils/jwt/refresh-jwt.ts +2 -2
  180. package/src/version.ts +1 -1
  181. package/src/wallets/smart/index.ts +19 -9
  182. package/src/wallets/smart/lib/bundler.ts +56 -9
  183. package/src/wallets/smart/lib/calls.ts +67 -28
  184. package/src/wallets/smart/lib/paymaster.ts +12 -13
  185. package/src/wallets/smart/lib/userop.ts +74 -30
  186. package/src/wallets/smart/types.ts +6 -6
@@ -1 +1 @@
1
- {"version":3,"file":"decode-jwt.js","sourceRoot":"","sources":["../../../../src/utils/jwt/decode-jwt.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,kCAAkC,EAAE,MAAM,iBAAiB,CAAC;AAGrE;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,UAAU,CAAC,GAAW;IACpC,MAAM,CAAC,aAAa,EAAE,cAAc,EAAE,gBAAgB,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEzE,IAAI,aAAa,KAAK,kCAAkC,EAAE,CAAC;QACzD,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;IACxC,CAAC;IACD,IAAI,CAAC,cAAc,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACzC,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;IACjC,CAAC;IAED,MAAM,OAAO,GAAe,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC;IACvE,MAAM,SAAS,GAAG,cAAc,CAAC,gBAAgB,CAAQ,CAAC;IAE1D,OAAO;QACL,OAAO;QACP,SAAS;KACV,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"decode-jwt.js","sourceRoot":"","sources":["../../../../src/utils/jwt/decode-jwt.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,kCAAkC,EAAE,MAAM,iBAAiB,CAAC;AAGrE;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,SAAS,CAAC,GAAW;IACnC,MAAM,CAAC,aAAa,EAAE,cAAc,EAAE,gBAAgB,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEzE,IAAI,aAAa,KAAK,kCAAkC,EAAE,CAAC;QACzD,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;IACxC,CAAC;IACD,IAAI,CAAC,cAAc,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACzC,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;IACjC,CAAC;IAED,MAAM,OAAO,GAAe,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC;IACvE,MAAM,SAAS,GAAG,cAAc,CAAC,gBAAgB,CAAQ,CAAC;IAE1D,OAAO;QACL,OAAO;QACP,SAAS;KACV,CAAC;AACJ,CAAC"}
@@ -1,4 +1,4 @@
1
- import { deccodeJWT } from "./decode-jwt.js";
1
+ import { decodeJWT } from "./decode-jwt.js";
2
2
  import { encodeJWT } from "./encode-jwt.js";
3
3
  const DEFAULT_EXPIRATION_TIME = 60 * 60 * 24;
4
4
  /**
@@ -18,7 +18,7 @@ const DEFAULT_EXPIRATION_TIME = 60 * 60 * 24;
18
18
  */
19
19
  export async function refreshJWT(options) {
20
20
  const { account, jwt, expirationTime = DEFAULT_EXPIRATION_TIME } = options;
21
- const payload = deccodeJWT(jwt).payload;
21
+ const payload = decodeJWT(jwt).payload;
22
22
  return encodeJWT({
23
23
  payload: {
24
24
  iss: payload.iss,
@@ -1 +1 @@
1
- {"version":3,"file":"refresh-jwt.js","sourceRoot":"","sources":["../../../../src/utils/jwt/refresh-jwt.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,MAAM,uBAAuB,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;AAQ7C;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,OAAyB;IACxD,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,cAAc,GAAG,uBAAuB,EAAE,GAAG,OAAO,CAAC;IAC3E,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC;IACxC,OAAO,SAAS,CAAC;QACf,OAAO,EAAE;YACP,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,GAAG,EAAE,IAAI,IAAI,EAAE;YACf,GAAG,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,cAAc,CAAC;YAC1C,GAAG,EAAE,IAAI,IAAI,EAAE;YACf,GAAG,EAAE,OAAO,CAAC,GAAG;SACjB;QACD,OAAO;KACR,CAAC,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"refresh-jwt.js","sourceRoot":"","sources":["../../../../src/utils/jwt/refresh-jwt.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,MAAM,uBAAuB,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;AAQ7C;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,OAAyB;IACxD,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,cAAc,GAAG,uBAAuB,EAAE,GAAG,OAAO,CAAC;IAC3E,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC;IACvC,OAAO,SAAS,CAAC;QACf,OAAO,EAAE;YACP,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,GAAG,EAAE,IAAI,IAAI,EAAE;YACf,GAAG,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,cAAc,CAAC;YAC1C,GAAG,EAAE,IAAI,IAAI,EAAE;YACf,GAAG,EAAE,OAAO,CAAC,GAAG;SACjB;QACD,OAAO;KACR,CAAC,CAAC;AACL,CAAC"}
@@ -1,2 +1,2 @@
1
- export const version = "5.34.0-nightly-f6ff5a78fc2d65f0f250b154f1405210ca57ce0a-20240708000345";
1
+ export const version = "5.34.0-nightly-95c9d3d92406de619cb1e4cccc61b0766dd2a0d4-20240708205331";
2
2
  //# sourceMappingURL=version.js.map
@@ -52,9 +52,11 @@ export async function connectSmartWallet(wallet, connectionOptions, creationOpti
52
52
  chain: chain,
53
53
  });
54
54
  // TODO: listen for chainChanged event on the personal wallet and emit the disconnect event on the smart wallet
55
- const accountAddress = await predictAddress(factoryContract, {
56
- personalAccountAddress: personalAccount.address,
57
- ...options,
55
+ const accountAddress = await predictAddress({
56
+ factoryContract,
57
+ adminAddress: personalAccount.address,
58
+ predictAddressOverride: options.overrides?.predictAddress,
59
+ accountSalt: options.overrides?.accountSalt,
58
60
  })
59
61
  .then((address) => address)
60
62
  .catch((err) => {
@@ -97,8 +99,8 @@ async function createSmartAccount(options) {
97
99
  async sendTransaction(transaction) {
98
100
  const executeTx = prepareExecute({
99
101
  accountContract,
100
- options,
101
102
  transaction,
103
+ executeOverride: options.overrides?.execute,
102
104
  });
103
105
  return _sendUserOp({
104
106
  executeTx,
@@ -108,8 +110,8 @@ async function createSmartAccount(options) {
108
110
  async sendBatchTransaction(transactions) {
109
111
  const executeTx = prepareBatchExecute({
110
112
  accountContract,
111
- options,
112
113
  transactions,
114
+ executeBatchOverride: options.overrides?.executeBatch,
113
115
  });
114
116
  return _sendUserOp({
115
117
  executeTx,
@@ -269,8 +271,9 @@ function createZkSyncAccount(args) {
269
271
  const pmData = await getZkPaymasterData({
270
272
  options: {
271
273
  client: connectionOptions.client,
272
- overrides: creationOptions.overrides,
273
274
  chain,
275
+ bundlerUrl: creationOptions.overrides?.bundlerUrl,
276
+ entrypointAddress: creationOptions.overrides?.entrypointAddress,
274
277
  },
275
278
  transaction: serializableTransaction,
276
279
  });
@@ -289,8 +292,9 @@ function createZkSyncAccount(args) {
289
292
  const txHash = await broadcastZkTransaction({
290
293
  options: {
291
294
  client: connectionOptions.client,
292
- overrides: creationOptions.overrides,
293
295
  chain,
296
+ bundlerUrl: creationOptions.overrides?.bundlerUrl,
297
+ entrypointAddress: creationOptions.overrides?.entrypointAddress,
294
298
  },
295
299
  transaction: serializableTransaction,
296
300
  signedTransaction,
@@ -337,10 +341,16 @@ async function _sendUserOp(args) {
337
341
  const { executeTx, options } = args;
338
342
  const unsignedUserOp = await createUnsignedUserOp({
339
343
  transaction: executeTx,
340
- options,
344
+ factoryContract: options.factoryContract,
345
+ accountContract: options.accountContract,
346
+ adminAddress: options.personalAccount.address,
347
+ sponsorGas: options.sponsorGas,
348
+ overrides: options.overrides,
341
349
  });
342
350
  const signedUserOp = await signUserOp({
343
- options,
351
+ chain: options.chain,
352
+ adminAccount: options.personalAccount,
353
+ entrypointAddress: options.overrides?.entrypointAddress,
344
354
  userOp: unsignedUserOp,
345
355
  });
346
356
  const userOpHash = await bundleUserOp({
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/wallets/smart/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,aAAa,GACd,MAAM,MAAM,CAAC;AAEd,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAyB,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAEhF,OAAO,EACL,yBAAyB,EACzB,qBAAqB,GACtB,MAAM,6DAA6D,CAAC;AAErE,OAAO,EAAE,cAAc,EAAE,MAAM,kDAAkD,CAAC;AAWlF,OAAO,EACL,sBAAsB,EACtB,YAAY,EACZ,kBAAkB,GACnB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,cAAc,GACf,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EACL,oBAAoB,EACpB,UAAU,EACV,oBAAoB,GACrB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAOjD;;;;;GAKG;AACH,MAAM,UAAU,aAAa,CAC3B,MAAwB;IAExB,OAAO,MAAM,CAAC,EAAE,KAAK,OAAO,CAAC;AAC/B,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,MAAM,gCAAgC,GAAG,IAAI,OAAO,EAGxD,CAAC;AAEJ,MAAM,+BAA+B,GAAG,IAAI,OAAO,EAA4B,CAAC;AAEhF;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,MAAuB,EACvB,iBAAkD,EAClD,eAA6C;IAE7C,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,iBAAiB,CAAC;IAE3E,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAC9D,CAAC;IAED,MAAM,OAAO,GAAG,eAAe,CAAC;IAChC,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,IAAI,uBAAuB,CAAC;IACzE,MAAM,KAAK,GAAG,YAAY,IAAI,OAAO,CAAC,KAAK,CAAC;IAC5C,MAAM,UAAU,GACd,SAAS,IAAI,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC;IAE9D,IAAI,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC;QAC3B,OAAO;YACL,mBAAmB,CAAC;gBAClB,eAAe;gBACf,iBAAiB;gBACjB,KAAK;gBACL,UAAU;aACX,CAAC;YACF,KAAK;SACN,CAAC;IACJ,CAAC;IAED,MAAM,eAAe,GAAG,WAAW,CAAC;QAClC,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,cAAc;QACvB,KAAK,EAAE,KAAK;KACb,CAAC,CAAC;IAEH,+GAA+G;IAC/G,MAAM,cAAc,GAAG,MAAM,cAAc,CAAC,eAAe,EAAE;QAC3D,sBAAsB,EAAE,eAAe,CAAC,OAAO;QAC/C,GAAG,OAAO;KACX,CAAC;SACC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC;SAC1B,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACb,MAAM,IAAI,KAAK,CACb,uDAAuD,eAAe,CAAC,OAAO,gBAAgB,KAAK,CAAC,EAAE,+BAA+B,EACrI,EAAE,KAAK,EAAE,GAAG,EAAE,CACf,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,MAAM,eAAe,GAAG,WAAW,CAAC;QAClC,MAAM;QACN,OAAO,EAAE,cAAc;QACvB,KAAK;KACN,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC;QACvC,GAAG,OAAO;QACV,KAAK;QACL,UAAU;QACV,eAAe;QACf,eAAe;QACf,eAAe;QACf,MAAM;KACP,CAAC,CAAC;IAEH,gCAAgC,CAAC,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;IAC9D,+BAA+B,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAE7D,OAAO,CAAC,OAAO,EAAE,KAAK,CAAU,CAAC;AACnC,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,MAAuB;IAEvB,mDAAmD;IACnD,MAAM,eAAe,GAAG,+BAA+B,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACpE,IAAI,eAAe,EAAE,CAAC;QACpB,sBAAsB;QACtB,gCAAgC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QACzD,+BAA+B,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACjD,CAAC;AACH,CAAC;AAED,KAAK,UAAU,kBAAkB,CAC/B,OAA4B;IAE5B,MAAM,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;IACpC,MAAM,OAAO,GAAY;QACvB,OAAO,EAAE,eAAe,CAAC,OAAO;QAChC,KAAK,CAAC,eAAe,CAAC,WAAkC;YACtD,MAAM,SAAS,GAAG,cAAc,CAAC;gBAC/B,eAAe;gBACf,OAAO;gBACP,WAAW;aACZ,CAAC,CAAC;YACH,OAAO,WAAW,CAAC;gBACjB,SAAS;gBACT,OAAO;aACR,CAAC,CAAC;QACL,CAAC;QACD,KAAK,CAAC,oBAAoB,CAAC,YAAqC;YAC9D,MAAM,SAAS,GAAG,mBAAmB,CAAC;gBACpC,eAAe;gBACf,OAAO;gBACP,YAAY;aACb,CAAC,CAAC;YACH,OAAO,WAAW,CAAC;gBACjB,SAAS;gBACT,OAAO;aACR,CAAC,CAAC;QACL,CAAC;QACD,KAAK,CAAC,WAAW,CAAC,EAAE,OAAO,EAAgC;YACzD,MAAM,CACJ,EAAE,kBAAkB,EAAE,EACtB,EAAE,YAAY,EAAE,EAChB,EAAE,mBAAmB,EAAE,EACvB,EAAE,WAAW,EAAE,EACf,EAAE,4BAA4B,EAAE,EACjC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBACpB,MAAM,CAAC,8CAA8C,CAAC;gBACtD,MAAM,CAAC,oCAAoC,CAAC;gBAC5C,MAAM,CAAC,wCAAwC,CAAC;gBAChD,MAAM,CAAC,oCAAoC,CAAC;gBAC5C,MAAM,CAAC,0DAA0D,CAAC;aACnE,CAAC,CAAC;YACH,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC,eAAe,CAAC,CAAC;YAC7D,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,MAAM,cAAc,CAAC;oBACnB,OAAO;oBACP,OAAO;oBACP,eAAe;iBAChB,CAAC,CAAC;YACL,CAAC;YAED,MAAM,eAAe,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;YAC7C,+EAA+E;YAC/E,IAAI,kBAAkB,GAAG,KAAK,CAAC;YAC/B,IAAI,CAAC;gBACH,sEAAsE;gBACtE,MAAM,YAAY,CAAC;oBACjB,QAAQ,EAAE,eAAe;oBACzB,MAAM,EACJ,sEAAsE;oBACxE,MAAM,EAAE,CAAC,eAAe,CAAC;iBAC1B,CAAC,CAAC;gBACH,kBAAkB,GAAG,IAAI,CAAC;YAC5B,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,SAAS;YACX,CAAC;YAED,IAAI,GAAkB,CAAC;YACvB,IAAI,kBAAkB,EAAE,CAAC;gBACvB,MAAM,kBAAkB,GAAG,mBAAmB,CAC5C,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,EACrB,CAAC,eAAe,CAAC,CAClB,CAAC;gBACF,GAAG,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,aAAa,CAAC;oBAChD,MAAM,EAAE;wBACN,IAAI,EAAE,SAAS;wBACf,OAAO,EAAE,GAAG;wBACZ,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE;wBACzB,iBAAiB,EAAE,eAAe,CAAC,OAAO;qBAC3C;oBACD,WAAW,EAAE,gBAAgB;oBAC7B,KAAK,EAAE,EAAE,cAAc,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE;oBAC/D,OAAO,EAAE,EAAE,OAAO,EAAE,kBAAkB,EAAE;iBACzC,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,GAAG,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;YAC/D,CAAC;YAED,MAAM,OAAO,GAAG,MAAM,4BAA4B,CAAC;gBACjD,QAAQ,EAAE,eAAe;gBACzB,OAAO;gBACP,SAAS,EAAE,GAAG;aACf,CAAC,CAAC;YAEH,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,GAAG,CAAC;YACb,CAAC;YACD,MAAM,IAAI,KAAK,CACb,yHAAyH,CAC1H,CAAC;QACJ,CAAC;QACD,KAAK,CAAC,aAAa,CAGjB,UAAuD;YACvD,MAAM,SAAS,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC;YAC7C,MAAM,CACJ,EAAE,kBAAkB,EAAE,EACtB,EAAE,YAAY,EAAE,EAChB,EAAE,mBAAmB,EAAE,EACvB,EAAE,kCAAkC,EAAE,EACvC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBACpB,MAAM,CAAC,8CAA8C,CAAC;gBACtD,MAAM,CAAC,oCAAoC,CAAC;gBAC5C,MAAM,CAAC,wCAAwC,CAAC;gBAChD,MAAM,CACJ,gEAAgE,CACjE;aACF,CAAC,CAAC;YACH,MAAM,uBAAuB,GAEzB,SAAS,CAAC,MACX,EAAE,iBAAiB,EAAE,WAAW,EAAE;gBACnC,eAAe,CAAC,OAAO,EAAE,WAAW,EAAE,CAAC;YAEzC,IAAI,uBAAuB,EAAE,CAAC;gBAC5B,0GAA0G;gBAC1G,OAAO,OAAO,CAAC,eAAe,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;YAC1D,CAAC;YAED,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC,eAAe,CAAC,CAAC;YAC7D,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,OAAO,CAAC,GAAG,CACT,6EAA6E,CAC9E,CAAC;gBACF,MAAM,cAAc,CAAC;oBACnB,OAAO;oBACP,OAAO;oBACP,eAAe;iBAChB,CAAC,CAAC;YACL,CAAC;YAED,MAAM,eAAe,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC;YACjD,+EAA+E;YAC/E,IAAI,kBAAkB,GAAG,KAAK,CAAC;YAC/B,IAAI,CAAC;gBACH,sEAAsE;gBACtE,MAAM,YAAY,CAAC;oBACjB,QAAQ,EAAE,eAAe;oBACzB,MAAM,EACJ,sEAAsE;oBACxE,MAAM,EAAE,CAAC,eAAe,CAAC;iBAC1B,CAAC,CAAC;gBACH,kBAAkB,GAAG,IAAI,CAAC;YAC5B,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,SAAS;YACX,CAAC;YAED,IAAI,GAAkB,CAAC;YACvB,IAAI,kBAAkB,EAAE,CAAC;gBACvB,MAAM,kBAAkB,GAAG,mBAAmB,CAC5C,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,EACrB,CAAC,eAAe,CAAC,CAClB,CAAC;gBACF,GAAG,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,aAAa,CAAC;oBAChD,MAAM,EAAE;wBACN,IAAI,EAAE,SAAS;wBACf,OAAO,EAAE,GAAG;wBACZ,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE;wBACzB,iBAAiB,EAAE,eAAe,CAAC,OAAO;qBAC3C;oBACD,WAAW,EAAE,gBAAgB;oBAC7B,KAAK,EAAE,EAAE,cAAc,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE;oBAC/D,OAAO,EAAE,EAAE,OAAO,EAAE,kBAAkB,EAAE;iBACzC,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,GAAG,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;YAC/D,CAAC;YAED,MAAM,OAAO,GAAG,MAAM,kCAAkC,CAAC;gBACvD,QAAQ,EAAE,eAAe;gBACzB,IAAI,EAAE,SAAS;gBACf,SAAS,EAAE,GAAG;aACf,CAAC,CAAC;YAEH,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,GAAG,CAAC;YACb,CAAC;YACD,MAAM,IAAI,KAAK,CACb,yHAAyH,CAC1H,CAAC;QACJ,CAAC;QACD,KAAK,CAAC,sBAAsB,CAAC,WAAW;YACtC,OAAO,OAAO,CAAC,eAAe,CAAC,sBAAsB,EAAE,CAAC,WAAW,CAAC,CAAC;QACvE,CAAC;KACF,CAAC;IACF,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,mBAAmB,CAAC,IAK5B;IACC,MAAM,EAAE,eAAe,EAAE,iBAAiB,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IAC3D,MAAM,OAAO,GAAY;QACvB,OAAO,EAAE,iBAAiB,CAAC,eAAe,CAAC,OAAO;QAClD,KAAK,CAAC,eAAe,CAAC,WAAkC;YACtD,6DAA6D;YAC7D,MAAM,MAAM,GAAG;gBACb,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,EAAE,EAAE,WAAW,CAAC,EAAE,IAAI,SAAS;gBAC/B,KAAK,EAAE,WAAW,CAAC,KAAK,IAAI,EAAE;gBAC9B,KAAK,EAAE,cAAc,CAAC,WAAW,CAAC,OAAO,CAAC;gBAC1C,MAAM,EAAE,iBAAiB,CAAC,MAAM;aACjC,CAAC;YAEF,IAAI,uBAAuB,GAAG,MAAM,yBAAyB,CAAC;gBAC5D,OAAO;gBACP,WAAW,EAAE,MAAM;aACpB,CAAC,CAAC;YAEH,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBACpB,sBAAsB;gBACtB,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC;oBACtC,OAAO,EAAE;wBACP,MAAM,EAAE,iBAAiB,CAAC,MAAM;wBAChC,SAAS,EAAE,eAAe,CAAC,SAAS;wBACpC,KAAK;qBACN;oBACD,WAAW,EAAE,uBAAuB;iBACrC,CAAC,CAAC;gBACH,uBAAuB,GAAG;oBACxB,GAAG,uBAAuB;oBAC1B,GAAG,MAAM;iBACV,CAAC;YACJ,CAAC;YAED,OAAO;YACP,MAAM,iBAAiB,GAAG,MAAM,qBAAqB,CAAC;gBACpD,OAAO;gBACP,OAAO,EAAE,KAAK,CAAC,EAAE;gBACjB,iBAAiB,EAAE,uBAAuB;aAC3C,CAAC,CAAC;YAEH,wBAAwB;YACxB,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC;gBAC1C,OAAO,EAAE;oBACP,MAAM,EAAE,iBAAiB,CAAC,MAAM;oBAChC,SAAS,EAAE,eAAe,CAAC,SAAS;oBACpC,KAAK;iBACN;gBACD,WAAW,EAAE,uBAAuB;gBACpC,iBAAiB;aAClB,CAAC,CAAC;YACH,OAAO;gBACL,eAAe,EAAE,MAAM,CAAC,eAAe;gBACvC,MAAM,EAAE,iBAAiB,CAAC,MAAM;gBAChC,KAAK,EAAE,KAAK;aACb,CAAC;QACJ,CAAC;QACD,KAAK,CAAC,WAAW,CAAC,EAAE,OAAO,EAAgC;YACzD,OAAO,iBAAiB,CAAC,eAAe,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QACpE,CAAC;QACD,KAAK,CAAC,aAAa,CAGjB,UAAuD;YACvD,MAAM,SAAS,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC;YAC7C,OAAO,iBAAiB,CAAC,eAAe,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QACpE,CAAC;QACD,KAAK,CAAC,sBAAsB,CAAC,WAAW;YACtC,OAAO,iBAAiB,CAAC,eAAe,CAAC,sBAAsB,EAAE,CAC/D,WAAW,CACZ,CAAC;QACJ,CAAC;KACF,CAAC;IACF,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,KAAK,UAAU,cAAc,CAAC,IAI7B;IACC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;IACnD,MAAM,CAAC,EAAE,eAAe,EAAE,EAAE,EAAE,kBAAkB,EAAE,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACtE,MAAM,CAAC,+CAA+C,CAAC;QACvD,MAAM,CAAC,0CAA0C,CAAC;KACnD,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,kBAAkB,CAAC;QACjC,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,EAAE,EAAE,eAAe,CAAC,OAAO;QAC3B,KAAK,EAAE,EAAE;QACT,GAAG,EAAE,MAAM,EAAE,sCAAsC;KACpD,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC;QACzC,WAAW,EAAE,OAAO;QACpB,OAAO;KACR,CAAC,CAAC;IACH,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,IAG1B;IACC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IACpC,MAAM,cAAc,GAAG,MAAM,oBAAoB,CAAC;QAChD,WAAW,EAAE,SAAS;QACtB,OAAO;KACR,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,MAAM,UAAU,CAAC;QACpC,OAAO;QACP,MAAM,EAAE,cAAc;KACvB,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,MAAM,YAAY,CAAC;QACpC,OAAO;QACP,MAAM,EAAE,YAAY;KACrB,CAAC,CAAC;IACH,yDAAyD;IACzD,MAAM,OAAO,GAAG,MAAM,oBAAoB,CAAC;QACzC,GAAG,OAAO;QACV,UAAU;KACX,CAAC,CAAC;IAEH,OAAO;QACL,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,eAAe,EAAE,OAAO,CAAC,eAAe;KACzC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/wallets/smart/index.ts"],"names":[],"mappings":"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"}
@@ -7,7 +7,19 @@ import { stringify } from "../../../utils/json.js";
7
7
  import { DEBUG, ENTRYPOINT_ADDRESS_v0_6, MANAGED_ACCOUNT_GAS_BUFFER, getDefaultBundlerUrl, } from "./constants.js";
8
8
  import { hexlifyUserOp } from "./utils.js";
9
9
  /**
10
- * @internal
10
+ * Bundle a user operation.
11
+ * @param args - The options for bundling a user operation.
12
+ * @returns The bundle hash of the user operation.
13
+ * @example
14
+ * ```ts
15
+ * import { bundleUserOp } from "thirdweb/wallets/smart";
16
+ *
17
+ * const userOpHash = await bundleUserOp({
18
+ * userOp,
19
+ * options,
20
+ * });
21
+ * ```
22
+ * @walletUtils
11
23
  */
12
24
  export async function bundleUserOp(args) {
13
25
  return sendBundlerRequest({
@@ -15,12 +27,24 @@ export async function bundleUserOp(args) {
15
27
  operation: "eth_sendUserOperation",
16
28
  params: [
17
29
  hexlifyUserOp(args.userOp),
18
- args.options.overrides?.entrypointAddress ?? ENTRYPOINT_ADDRESS_v0_6,
30
+ args.options.entrypointAddress ?? ENTRYPOINT_ADDRESS_v0_6,
19
31
  ],
20
32
  });
21
33
  }
22
34
  /**
23
- * @internal
35
+ * Estimate the gas cost of a user operation.
36
+ * @param args - The options for estimating the gas cost of a user operation.
37
+ * @returns The estimated gas cost of the user operation.
38
+ * @example
39
+ * ```ts
40
+ * import { estimateUserOpGas } from "thirdweb/wallets/smart";
41
+ *
42
+ * const gasCost = await estimateUserOpGas({
43
+ * userOp,
44
+ * options,
45
+ * });
46
+ * ```
47
+ * @walletUtils
24
48
  */
25
49
  export async function estimateUserOpGas(args) {
26
50
  const res = await sendBundlerRequest({
@@ -28,7 +52,7 @@ export async function estimateUserOpGas(args) {
28
52
  operation: "eth_estimateUserOperationGas",
29
53
  params: [
30
54
  hexlifyUserOp(args.userOp),
31
- args.options.overrides?.entrypointAddress ?? ENTRYPOINT_ADDRESS_v0_6,
55
+ args.options.entrypointAddress ?? ENTRYPOINT_ADDRESS_v0_6,
32
56
  ],
33
57
  });
34
58
  // add gas buffer for managed account factory delegate calls
@@ -40,9 +64,20 @@ export async function estimateUserOpGas(args) {
40
64
  };
41
65
  }
42
66
  /**
43
- * @internal
67
+ * Get the gas fees of a user operation.
68
+ * @param args - The options for getting the gas price of a user operation.
69
+ * @returns The gas price of the user operation.
70
+ * @example
71
+ * ```ts
72
+ * import { getUserOpGasPrice } from "thirdweb/wallets/smart";
73
+ *
74
+ * const fees = await getUserOpGasPrice({
75
+ * options,
76
+ * });
77
+ * ```
78
+ * @walletUtils
44
79
  */
45
- export async function getUserOpGasPrice(args) {
80
+ export async function getUserOpGasFees(args) {
46
81
  const res = await sendBundlerRequest({
47
82
  ...args,
48
83
  operation: "thirdweb_getUserOperationGasPrice",
@@ -54,7 +89,20 @@ export async function getUserOpGasPrice(args) {
54
89
  };
55
90
  }
56
91
  /**
57
- * @internal
92
+ * Get the receipt of a user operation.
93
+ * @param args - The options for getting the receipt of a user operation.
94
+ * @returns The receipt of the user operation.
95
+ * @example
96
+ * ```ts
97
+ * import { getUserOpReceipt } from "thirdweb/wallets/smart";
98
+ *
99
+ * const receipt = await getUserOpReceipt({
100
+ * client,
101
+ * chain,
102
+ * userOpHash,
103
+ * });
104
+ * ```
105
+ * @walletUtils
58
106
  */
59
107
  export async function getUserOpReceipt(args) {
60
108
  const res = await sendBundlerRequest({
@@ -116,7 +164,7 @@ async function sendBundlerRequest(args) {
116
164
  if (DEBUG) {
117
165
  console.debug(`>>> sending ${operation} with payload:`, params);
118
166
  }
119
- const bundlerUrl = options.overrides?.bundlerUrl ?? getDefaultBundlerUrl(options.chain);
167
+ const bundlerUrl = options.bundlerUrl ?? getDefaultBundlerUrl(options.chain);
120
168
  const fetchWithHeaders = getClientFetch(options.client);
121
169
  const response = await fetchWithHeaders(bundlerUrl, {
122
170
  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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"}
@@ -2,20 +2,33 @@ import { prepareContractCall } from "../../../transaction/prepare-contract-call.
2
2
  import { readContract } from "../../../transaction/read-contract.js";
3
3
  import { stringToHex } from "../../../utils/encoding/hex.js";
4
4
  /**
5
- * @internal
5
+ * Predict the address of a smart account.
6
+ * @param args - The options for predicting the address of a smart account.
7
+ * @returns The predicted address of the smart account.
8
+ * @example
9
+ * ```ts
10
+ * import { predictAddress } from "thirdweb/wallets/smart";
11
+ *
12
+ * const predictedAddress = await predictAddress({
13
+ * factoryContract,
14
+ * adminAddress,
15
+ * accountSalt,
16
+ * });
17
+ * ```
18
+ * @walletUtils
6
19
  */
7
- export async function predictAddress(factoryContract, options) {
8
- if (options.overrides?.predictAddress) {
9
- return options.overrides.predictAddress(factoryContract);
20
+ export async function predictAddress(args) {
21
+ const { factoryContract, predictAddressOverride: predictAddress, adminAddress, accountSalt, accountAddress, } = args;
22
+ if (predictAddress) {
23
+ return predictAddress(factoryContract);
10
24
  }
11
- if (options.overrides?.accountAddress) {
12
- return options.overrides.accountAddress;
25
+ if (accountAddress) {
26
+ return accountAddress;
13
27
  }
14
- const adminAddress = options.personalAccountAddress;
15
28
  if (!adminAddress) {
16
29
  throw new Error("Account address is required to predict the smart wallet address.");
17
30
  }
18
- const extraData = stringToHex(options.overrides?.accountSalt ?? "");
31
+ const extraData = stringToHex(accountSalt ?? "");
19
32
  return readContract({
20
33
  contract: factoryContract,
21
34
  method: "function getAddress(address, bytes) returns (address)",
@@ -26,26 +39,23 @@ export async function predictAddress(factoryContract, options) {
26
39
  * @internal
27
40
  */
28
41
  export function prepareCreateAccount(args) {
29
- const { factoryContract, options } = args;
30
- if (options.overrides?.createAccount) {
31
- return options.overrides.createAccount(factoryContract);
42
+ const { adminAddress, factoryContract, createAccountOverride: createAccount, accountSalt, } = args;
43
+ if (createAccount) {
44
+ return createAccount(factoryContract);
32
45
  }
33
46
  return prepareContractCall({
34
47
  contract: factoryContract,
35
48
  method: "function createAccount(address, bytes) returns (address)",
36
- params: [
37
- options.personalAccount.address,
38
- stringToHex(options.overrides?.accountSalt ?? ""),
39
- ],
49
+ params: [adminAddress, stringToHex(accountSalt ?? "")],
40
50
  });
41
51
  }
42
52
  /**
43
53
  * @internal
44
54
  */
45
55
  export function prepareExecute(args) {
46
- const { accountContract, options, transaction } = args;
47
- if (options.overrides?.execute) {
48
- return options.overrides.execute(accountContract, transaction);
56
+ const { accountContract, transaction, executeOverride: execute } = args;
57
+ if (execute) {
58
+ return execute(accountContract, transaction);
49
59
  }
50
60
  return prepareContractCall({
51
61
  contract: accountContract,
@@ -61,9 +71,9 @@ export function prepareExecute(args) {
61
71
  * @internal
62
72
  */
63
73
  export function prepareBatchExecute(args) {
64
- const { accountContract, options, transactions } = args;
65
- if (options.overrides?.executeBatch) {
66
- return options.overrides.executeBatch(accountContract, transactions);
74
+ const { accountContract, transactions, executeBatchOverride: executeBatch, } = args;
75
+ if (executeBatch) {
76
+ return executeBatch(accountContract, transactions);
67
77
  }
68
78
  return prepareContractCall({
69
79
  contract: accountContract,
@@ -1 +1 @@
1
- {"version":3,"file":"calls.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/calls.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"calls.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/calls.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AAEpF,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAG7D;;;;;;;;;;;;;;;GAeG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,IAQpC;IACC,MAAM,EACJ,eAAe,EACf,sBAAsB,EAAE,cAAc,EACtC,YAAY,EACZ,WAAW,EACX,cAAc,GACf,GAAG,IAAI,CAAC;IACT,IAAI,cAAc,EAAE,CAAC;QACnB,OAAO,cAAc,CAAC,eAAe,CAAC,CAAC;IACzC,CAAC;IACD,IAAI,cAAc,EAAE,CAAC;QACnB,OAAO,cAAc,CAAC;IACxB,CAAC;IACD,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CACb,kEAAkE,CACnE,CAAC;IACJ,CAAC;IACD,MAAM,SAAS,GAAG,WAAW,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;IACjD,OAAO,YAAY,CAAC;QAClB,QAAQ,EAAE,eAAe;QACzB,MAAM,EAAE,uDAAuD;QAC/D,MAAM,EAAE,CAAC,YAAY,EAAE,SAAS,CAAC;KAClC,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAAC,IAOpC;IACC,MAAM,EACJ,YAAY,EACZ,eAAe,EACf,qBAAqB,EAAE,aAAa,EACpC,WAAW,GACZ,GAAG,IAAI,CAAC;IACT,IAAI,aAAa,EAAE,CAAC;QAClB,OAAO,aAAa,CAAC,eAAe,CAAC,CAAC;IACxC,CAAC;IACD,OAAO,mBAAmB,CAAC;QACzB,QAAQ,EAAE,eAAe;QACzB,MAAM,EAAE,0DAA0D;QAClE,MAAM,EAAE,CAAC,YAAY,EAAE,WAAW,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;KACvD,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,cAAc,CAAC,IAO9B;IACC,MAAM,EAAE,eAAe,EAAE,WAAW,EAAE,eAAe,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IACxE,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,OAAO,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;IAC/C,CAAC;IACD,OAAO,mBAAmB,CAAC;QACzB,QAAQ,EAAE,eAAe;QACzB,MAAM,EAAE,2CAA2C;QACnD,MAAM,EAAE;YACN,WAAW,CAAC,EAAE,IAAI,EAAE;YACpB,WAAW,CAAC,KAAK,IAAI,EAAE;YACvB,WAAW,CAAC,IAAI,IAAI,IAAI;SACzB;KACF,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,mBAAmB,CAAC,IAOnC;IACC,MAAM,EACJ,eAAe,EACf,YAAY,EACZ,oBAAoB,EAAE,YAAY,GACnC,GAAG,IAAI,CAAC;IACT,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO,YAAY,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;IACrD,CAAC;IACD,OAAO,mBAAmB,CAAC;QACzB,QAAQ,EAAE,eAAe;QACzB,MAAM,EAAE,sDAAsD;QAC9D,MAAM,EAAE;YACN,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC;YACrC,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC;YACxC,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,IAAI,IAAI,CAAC;SAC1C;KACF,CAAC,CAAC;AACL,CAAC"}
@@ -7,16 +7,15 @@ import { hexlifyUserOp } from "./utils.js";
7
7
  * @internal
8
8
  */
9
9
  export async function getPaymasterAndData(args) {
10
- const { userOp, options } = args;
11
- if (options.overrides?.paymaster) {
12
- return options.overrides?.paymaster(userOp);
10
+ const { userOp, paymasterOverride, client, chain, entrypointAddress } = args;
11
+ if (paymasterOverride) {
12
+ return paymasterOverride(userOp);
13
13
  }
14
14
  const headers = {
15
15
  "Content-Type": "application/json",
16
16
  };
17
- const client = options.client;
18
- const paymasterUrl = getDefaultPaymasterUrl(options.chain);
19
- const entrypoint = options.overrides?.entrypointAddress ?? ENTRYPOINT_ADDRESS_v0_6;
17
+ const paymasterUrl = getDefaultPaymasterUrl(chain);
18
+ const entrypoint = entrypointAddress ?? ENTRYPOINT_ADDRESS_v0_6;
20
19
  // Ask the paymaster to sign the transaction and return a valid paymasterAndData value.
21
20
  const fetchWithHeaders = getClientFetch(client);
22
21
  const response = await fetchWithHeaders(paymasterUrl, {
@@ -1 +1 @@
1
- {"version":3,"file":"paymaster.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/paymaster.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"paymaster.js","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/paymaster.ts"],"names":[],"mappings":"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"}
@@ -7,7 +7,7 @@ import { hexToBytes } from "../../../utils/encoding/to-bytes.js";
7
7
  import { isThirdwebUrl } from "../../../utils/fetch.js";
8
8
  import { keccak256 } from "../../../utils/hashing/keccak256.js";
9
9
  import { resolvePromisedValue } from "../../../utils/promise/resolve-promised-value.js";
10
- import { estimateUserOpGas, getUserOpGasPrice, getUserOpReceipt, } from "./bundler.js";
10
+ import { estimateUserOpGas, getUserOpGasFees, getUserOpReceipt, } from "./bundler.js";
11
11
  import { prepareCreateAccount } from "./calls.js";
12
12
  import { DUMMY_SIGNATURE, ENTRYPOINT_ADDRESS_v0_6, getDefaultBundlerUrl, } from "./constants.js";
13
13
  import { getPaymasterAndData } from "./paymaster.js";
@@ -54,22 +54,38 @@ export async function waitForUserOpReceipt(args) {
54
54
  *
55
55
  * const userOp = await createUnsignedUserOp({
56
56
  * transaction,
57
- * options,
57
+ * accountContract,
58
+ * sponsorGas,
59
+ * overrides,
58
60
  * });
59
61
  * ```
60
62
  * @walletUtils
61
63
  */
62
64
  export async function createUnsignedUserOp(args) {
63
- const { transaction: executeTx, options } = args;
64
- const isDeployed = await isContractDeployed(options.accountContract);
65
- const initCode = isDeployed ? "0x" : await getAccountInitCode(options);
65
+ const { transaction: executeTx, accountContract, factoryContract, adminAddress, overrides, sponsorGas, } = args;
66
+ const chain = executeTx.chain;
67
+ const client = executeTx.client;
68
+ const isDeployed = await isContractDeployed(accountContract);
69
+ const initCode = isDeployed
70
+ ? "0x"
71
+ : await getAccountInitCode({
72
+ factoryContract: factoryContract,
73
+ adminAddress,
74
+ accountSalt: overrides?.accountSalt,
75
+ createAccountOverride: overrides?.createAccount,
76
+ });
66
77
  const callData = await encode(executeTx);
78
+ const bundlerOptions = {
79
+ client,
80
+ chain,
81
+ entrypointAddress: overrides?.entrypointAddress,
82
+ };
67
83
  let { maxFeePerGas, maxPriorityFeePerGas } = executeTx;
68
- const bundlerUrl = options.overrides?.bundlerUrl ?? getDefaultBundlerUrl(options.chain);
84
+ const bundlerUrl = overrides?.bundlerUrl ?? getDefaultBundlerUrl(chain);
69
85
  if (isThirdwebUrl(bundlerUrl)) {
70
86
  // get gas prices from bundler
71
- const bundlerGasPrice = await getUserOpGasPrice({
72
- options,
87
+ const bundlerGasPrice = await getUserOpGasFees({
88
+ options: bundlerOptions,
73
89
  });
74
90
  maxFeePerGas = bundlerGasPrice.maxFeePerGas;
75
91
  maxPriorityFeePerGas = bundlerGasPrice.maxPriorityFeePerGas;
@@ -87,7 +103,7 @@ export async function createUnsignedUserOp(args) {
87
103
  }
88
104
  else {
89
105
  // Fallback to RPC gas prices if no explicit values provided
90
- const feeData = await getDefaultGasOverrides(options.client, options.chain);
106
+ const feeData = await getDefaultGasOverrides(client, chain);
91
107
  // Still check for explicit values in case one is provided and not the other
92
108
  maxPriorityFeePerGas =
93
109
  resolvedMaxPriorityFeePerGas ?? feeData.maxPriorityFeePerGas ?? 0n;
@@ -97,7 +113,7 @@ export async function createUnsignedUserOp(args) {
97
113
  // const nonce = BigInt(transaction.nonce || randomNonce());
98
114
  const nonce = randomNonce(); // FIXME getNonce should be overrideable by the wallet
99
115
  const partialOp = {
100
- sender: options.accountContract.address,
116
+ sender: accountContract.address,
101
117
  nonce,
102
118
  initCode,
103
119
  callData,
@@ -109,10 +125,13 @@ export async function createUnsignedUserOp(args) {
109
125
  paymasterAndData: "0x",
110
126
  signature: DUMMY_SIGNATURE,
111
127
  };
112
- if (options.sponsorGas) {
128
+ if (sponsorGas) {
113
129
  const paymasterResult = await getPaymasterAndData({
114
130
  userOp: partialOp,
115
- options,
131
+ chain,
132
+ client,
133
+ entrypointAddress: overrides?.entrypointAddress,
134
+ paymasterOverride: overrides?.paymaster,
116
135
  });
117
136
  const paymasterAndData = paymasterResult.paymasterAndData;
118
137
  if (paymasterAndData && paymasterAndData !== "0x") {
@@ -130,7 +149,7 @@ export async function createUnsignedUserOp(args) {
130
149
  // otherwise fallback to bundler for gas limits
131
150
  const estimates = await estimateUserOpGas({
132
151
  userOp: partialOp,
133
- options,
152
+ options: bundlerOptions,
134
153
  });
135
154
  partialOp.callGasLimit = estimates.callGasLimit;
136
155
  partialOp.verificationGasLimit = estimates.verificationGasLimit;
@@ -139,7 +158,10 @@ export async function createUnsignedUserOp(args) {
139
158
  if (paymasterAndData && paymasterAndData !== "0x") {
140
159
  const paymasterResult2 = await getPaymasterAndData({
141
160
  userOp: partialOp,
142
- options,
161
+ chain,
162
+ client,
163
+ entrypointAddress: overrides?.entrypointAddress,
164
+ paymasterOverride: overrides?.paymaster,
143
165
  });
144
166
  if (paymasterResult2.paymasterAndData &&
145
167
  paymasterResult2.paymasterAndData !== "0x") {
@@ -152,7 +174,7 @@ export async function createUnsignedUserOp(args) {
152
174
  // not gasless, so we just need to estimate gas limits
153
175
  const estimates = await estimateUserOpGas({
154
176
  userOp: partialOp,
155
- options,
177
+ options: bundlerOptions,
156
178
  });
157
179
  partialOp.callGasLimit = estimates.callGasLimit;
158
180
  partialOp.verificationGasLimit = estimates.verificationGasLimit;
@@ -181,14 +203,14 @@ export async function createUnsignedUserOp(args) {
181
203
  * @walletUtils
182
204
  */
183
205
  export async function signUserOp(args) {
184
- const { userOp, options } = args;
206
+ const { userOp, chain, entrypointAddress, adminAccount } = args;
185
207
  const userOpHash = getUserOpHash({
186
208
  userOp,
187
- entryPoint: options.overrides?.entrypointAddress || ENTRYPOINT_ADDRESS_v0_6,
188
- chainId: options.chain.id,
209
+ entryPoint: entrypointAddress || ENTRYPOINT_ADDRESS_v0_6,
210
+ chainId: chain.id,
189
211
  });
190
- if (options.personalAccount.signMessage) {
191
- const signature = await options.personalAccount.signMessage({
212
+ if (adminAccount.signMessage) {
213
+ const signature = await adminAccount.signMessage({
192
214
  message: {
193
215
  raw: hexToBytes(userOpHash),
194
216
  },
@@ -201,10 +223,12 @@ export async function signUserOp(args) {
201
223
  throw new Error("signMessage not implemented in signingAccount");
202
224
  }
203
225
  async function getAccountInitCode(options) {
204
- const { factoryContract } = options;
226
+ const { factoryContract, adminAddress, accountSalt, createAccountOverride } = options;
205
227
  const deployTx = prepareCreateAccount({
206
228
  factoryContract,
207
- options,
229
+ adminAddress,
230
+ accountSalt,
231
+ createAccountOverride,
208
232
  });
209
233
  return concat([factoryContract.address, await encode(deployTx)]);
210
234
  }
@@ -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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"}