viem 2.19.8 → 2.20.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (101) hide show
  1. package/CHANGELOG.md +26 -0
  2. package/_cjs/account-abstraction/accounts/toSmartAccount.js +4 -5
  3. package/_cjs/account-abstraction/accounts/toSmartAccount.js.map +1 -1
  4. package/_cjs/account-abstraction/actions/bundler/estimateUserOperationGas.js +12 -9
  5. package/_cjs/account-abstraction/actions/bundler/estimateUserOperationGas.js.map +1 -1
  6. package/_cjs/account-abstraction/actions/bundler/sendUserOperation.js +14 -8
  7. package/_cjs/account-abstraction/actions/bundler/sendUserOperation.js.map +1 -1
  8. package/_cjs/accounts/privateKeyToAccount.js.map +1 -1
  9. package/_cjs/actions/test/setCode.js +10 -4
  10. package/_cjs/actions/test/setCode.js.map +1 -1
  11. package/_cjs/errors/version.js +1 -1
  12. package/_cjs/experimental/eip5792/actions/sendCalls.js +22 -7
  13. package/_cjs/experimental/eip5792/actions/sendCalls.js.map +1 -1
  14. package/_cjs/experimental/eip5792/actions/writeContracts.js.map +1 -1
  15. package/_cjs/op-stack/actions/getTimeToFinalize.js +7 -1
  16. package/_cjs/op-stack/actions/getTimeToFinalize.js.map +1 -1
  17. package/_cjs/op-stack/actions/getWithdrawalStatus.js +7 -1
  18. package/_cjs/op-stack/actions/getWithdrawalStatus.js.map +1 -1
  19. package/_cjs/zksync/accounts/toMultisigSmartAccount.js +16 -0
  20. package/_cjs/zksync/accounts/toMultisigSmartAccount.js.map +1 -0
  21. package/_cjs/zksync/accounts/toSinglesigSmartAccount.js +15 -0
  22. package/_cjs/zksync/accounts/toSinglesigSmartAccount.js.map +1 -0
  23. package/_cjs/zksync/accounts/toSmartAccount.js +42 -0
  24. package/_cjs/zksync/accounts/toSmartAccount.js.map +1 -0
  25. package/_cjs/zksync/index.js +7 -1
  26. package/_cjs/zksync/index.js.map +1 -1
  27. package/_cjs/zksync/types/account.js +3 -0
  28. package/_cjs/zksync/types/account.js.map +1 -0
  29. package/_esm/account-abstraction/accounts/toSmartAccount.js +4 -5
  30. package/_esm/account-abstraction/accounts/toSmartAccount.js.map +1 -1
  31. package/_esm/account-abstraction/actions/bundler/estimateUserOperationGas.js +12 -9
  32. package/_esm/account-abstraction/actions/bundler/estimateUserOperationGas.js.map +1 -1
  33. package/_esm/account-abstraction/actions/bundler/sendUserOperation.js +14 -8
  34. package/_esm/account-abstraction/actions/bundler/sendUserOperation.js.map +1 -1
  35. package/_esm/accounts/privateKeyToAccount.js.map +1 -1
  36. package/_esm/actions/test/setCode.js +10 -4
  37. package/_esm/actions/test/setCode.js.map +1 -1
  38. package/_esm/errors/version.js +1 -1
  39. package/_esm/experimental/eip5792/actions/sendCalls.js +22 -7
  40. package/_esm/experimental/eip5792/actions/sendCalls.js.map +1 -1
  41. package/_esm/experimental/eip5792/actions/writeContracts.js +2 -0
  42. package/_esm/experimental/eip5792/actions/writeContracts.js.map +1 -1
  43. package/_esm/op-stack/actions/getTimeToFinalize.js +7 -1
  44. package/_esm/op-stack/actions/getTimeToFinalize.js.map +1 -1
  45. package/_esm/op-stack/actions/getWithdrawalStatus.js +7 -1
  46. package/_esm/op-stack/actions/getWithdrawalStatus.js.map +1 -1
  47. package/_esm/zksync/accounts/toMultisigSmartAccount.js +17 -0
  48. package/_esm/zksync/accounts/toMultisigSmartAccount.js.map +1 -0
  49. package/_esm/zksync/accounts/toSinglesigSmartAccount.js +16 -0
  50. package/_esm/zksync/accounts/toSinglesigSmartAccount.js.map +1 -0
  51. package/_esm/zksync/accounts/toSmartAccount.js +43 -0
  52. package/_esm/zksync/accounts/toSmartAccount.js.map +1 -0
  53. package/_esm/zksync/index.js +3 -0
  54. package/_esm/zksync/index.js.map +1 -1
  55. package/_esm/zksync/types/account.js +2 -0
  56. package/_esm/zksync/types/account.js.map +1 -0
  57. package/_types/account-abstraction/accounts/toSmartAccount.d.ts.map +1 -1
  58. package/_types/account-abstraction/accounts/types.d.ts +3 -0
  59. package/_types/account-abstraction/accounts/types.d.ts.map +1 -1
  60. package/_types/account-abstraction/actions/bundler/estimateUserOperationGas.d.ts +6 -4
  61. package/_types/account-abstraction/actions/bundler/estimateUserOperationGas.d.ts.map +1 -1
  62. package/_types/account-abstraction/actions/bundler/sendUserOperation.d.ts +7 -5
  63. package/_types/account-abstraction/actions/bundler/sendUserOperation.d.ts.map +1 -1
  64. package/_types/actions/test/setCode.d.ts.map +1 -1
  65. package/_types/errors/version.d.ts +1 -1
  66. package/_types/experimental/eip5792/actions/sendCalls.d.ts +33 -12
  67. package/_types/experimental/eip5792/actions/sendCalls.d.ts.map +1 -1
  68. package/_types/experimental/eip5792/actions/writeContracts.d.ts +2 -0
  69. package/_types/experimental/eip5792/actions/writeContracts.d.ts.map +1 -1
  70. package/_types/op-stack/actions/getTimeToFinalize.d.ts.map +1 -1
  71. package/_types/op-stack/actions/getWithdrawalStatus.d.ts.map +1 -1
  72. package/_types/types/eip1193.d.ts +23 -9
  73. package/_types/types/eip1193.d.ts.map +1 -1
  74. package/_types/zksync/accounts/toMultisigSmartAccount.d.ts +15 -0
  75. package/_types/zksync/accounts/toMultisigSmartAccount.d.ts.map +1 -0
  76. package/_types/zksync/accounts/toSinglesigSmartAccount.d.ts +15 -0
  77. package/_types/zksync/accounts/toSinglesigSmartAccount.d.ts.map +1 -0
  78. package/_types/zksync/accounts/toSmartAccount.d.ts +19 -0
  79. package/_types/zksync/accounts/toSmartAccount.d.ts.map +1 -0
  80. package/_types/zksync/index.d.ts +4 -0
  81. package/_types/zksync/index.d.ts.map +1 -1
  82. package/_types/zksync/types/account.d.ts +5 -0
  83. package/_types/zksync/types/account.d.ts.map +1 -0
  84. package/account-abstraction/accounts/toSmartAccount.ts +12 -10
  85. package/account-abstraction/accounts/types.ts +3 -0
  86. package/account-abstraction/actions/bundler/estimateUserOperationGas.ts +53 -32
  87. package/account-abstraction/actions/bundler/sendUserOperation.ts +50 -33
  88. package/accounts/privateKeyToAccount.ts +1 -1
  89. package/actions/test/setCode.ts +10 -4
  90. package/errors/version.ts +1 -1
  91. package/experimental/eip5792/actions/sendCalls.ts +107 -21
  92. package/experimental/eip5792/actions/writeContracts.ts +2 -0
  93. package/op-stack/actions/getTimeToFinalize.ts +8 -1
  94. package/op-stack/actions/getWithdrawalStatus.ts +8 -1
  95. package/package.json +1 -1
  96. package/types/eip1193.ts +25 -14
  97. package/zksync/accounts/toMultisigSmartAccount.ts +37 -0
  98. package/zksync/accounts/toSinglesigSmartAccount.ts +30 -0
  99. package/zksync/accounts/toSmartAccount.ts +63 -0
  100. package/zksync/index.ts +15 -0
  101. package/zksync/types/account.ts +5 -0
@@ -32,13 +32,15 @@ import { prepareUserOperation, } from './prepareUserOperation.js';
32
32
  * })
33
33
  */
34
34
  export async function sendUserOperation(client, parameters) {
35
- const { account: account_ = client.account } = parameters;
36
- if (!account_)
35
+ const { account: account_ = client.account, entryPointAddress } = parameters;
36
+ if (!account_ && !parameters.sender)
37
37
  throw new AccountNotFoundError();
38
- const account = parseAccount(account_);
39
- const request = await getAction(client, prepareUserOperation, 'prepareUserOperation')(parameters);
40
- const signature = parameters.signature ||
41
- (await account.signUserOperation(request));
38
+ const account = account_ ? parseAccount(account_) : undefined;
39
+ const request = account
40
+ ? await getAction(client, prepareUserOperation, 'prepareUserOperation')(parameters)
41
+ : parameters;
42
+ const signature = (parameters.signature ||
43
+ (await account?.signUserOperation(request)));
42
44
  const rpcParameters = formatUserOperationRequest({
43
45
  ...request,
44
46
  signature,
@@ -46,13 +48,17 @@ export async function sendUserOperation(client, parameters) {
46
48
  try {
47
49
  return await client.request({
48
50
  method: 'eth_sendUserOperation',
49
- params: [rpcParameters, account.entryPoint.address],
51
+ params: [
52
+ rpcParameters,
53
+ (entryPointAddress ?? account?.entryPoint.address),
54
+ ],
50
55
  }, { retryCount: 0 });
51
56
  }
52
57
  catch (error) {
58
+ const calls = parameters.calls;
53
59
  throw getUserOperationError(error, {
54
60
  ...request,
55
- calls: parameters.calls,
61
+ ...(calls ? { calls } : {}),
56
62
  signature,
57
63
  });
58
64
  }
@@ -1 +1 @@
1
- {"version":3,"file":"sendUserOperation.js","sourceRoot":"","sources":["../../../../account-abstraction/actions/bundler/sendUserOperation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAA;AAGtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAA;AAOjE,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AAgBvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAA;AACnF,OAAO,EAEL,0BAA0B,GAC3B,MAAM,gDAAgD,CAAA;AACvD,OAAO,EAGL,oBAAoB,GACrB,MAAM,2BAA2B,CAAA;AA0ClC;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAKrC,MAAqD,EACrD,UAAwE;IAExE,MAAM,EAAE,OAAO,EAAE,QAAQ,GAAG,MAAM,CAAC,OAAO,EAAE,GAAG,UAAU,CAAA;IAEzD,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,oBAAoB,EAAE,CAAA;IAC/C,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAA;IAEtC,MAAM,OAAO,GAAG,MAAM,SAAS,CAC7B,MAAM,EACN,oBAAoB,EACpB,sBAAsB,CACvB,CAAC,UAAuD,CAAC,CAAA;IAE1D,MAAM,SAAS,GACb,UAAU,CAAC,SAAS;QACpB,CAAC,MAAM,OAAO,CAAC,iBAAiB,CAAC,OAAwB,CAAC,CAAC,CAAA;IAE7D,MAAM,aAAa,GAAG,0BAA0B,CAAC;QAC/C,GAAG,OAAO;QACV,SAAS;KACO,CAAC,CAAA;IAEnB,IAAI,CAAC;QACH,OAAO,MAAM,MAAM,CAAC,OAAO,CACzB;YACE,MAAM,EAAE,uBAAuB;YAC/B,MAAM,EAAE,CAAC,aAAa,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC;SACpD,EACD,EAAE,UAAU,EAAE,CAAC,EAAE,CAClB,CAAA;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,qBAAqB,CAAC,KAAkB,EAAE;YAC9C,GAAI,OAAyB;YAC7B,KAAK,EAAE,UAAU,CAAC,KAAK;YACvB,SAAS;SACV,CAAC,CAAA;IACJ,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"sendUserOperation.js","sourceRoot":"","sources":["../../../../account-abstraction/actions/bundler/sendUserOperation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAA;AAGtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAA;AAOjE,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AAgBvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAA;AACnF,OAAO,EAEL,0BAA0B,GAC3B,MAAM,gDAAgD,CAAA;AACvD,OAAO,EAGL,oBAAoB,GACrB,MAAM,2BAA2B,CAAA;AAsDlC;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAKrC,MAAqD,EACrD,UAAwE;IAExE,MAAM,EAAE,OAAO,EAAE,QAAQ,GAAG,MAAM,CAAC,OAAO,EAAE,iBAAiB,EAAE,GAAG,UAAU,CAAA;IAE5E,IAAI,CAAC,QAAQ,IAAI,CAAC,UAAU,CAAC,MAAM;QAAE,MAAM,IAAI,oBAAoB,EAAE,CAAA;IACrE,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAE7D,MAAM,OAAO,GAAG,OAAO;QACrB,CAAC,CAAC,MAAM,SAAS,CACb,MAAM,EACN,oBAAoB,EACpB,sBAAsB,CACvB,CAAC,UAAuD,CAAC;QAC5D,CAAC,CAAC,UAAU,CAAA;IAEd,MAAM,SAAS,GAAG,CAAC,UAAU,CAAC,SAAS;QACrC,CAAC,MAAM,OAAO,EAAE,iBAAiB,CAAC,OAAwB,CAAC,CAAC,CAAE,CAAA;IAEhE,MAAM,aAAa,GAAG,0BAA0B,CAAC;QAC/C,GAAG,OAAO;QACV,SAAS;KACO,CAAC,CAAA;IAEnB,IAAI,CAAC;QACH,OAAO,MAAM,MAAM,CAAC,OAAO,CACzB;YACE,MAAM,EAAE,uBAAuB;YAC/B,MAAM,EAAE;gBACN,aAAa;gBACb,CAAC,iBAAiB,IAAI,OAAO,EAAE,UAAU,CAAC,OAAO,CAAE;aACpD;SACF,EACD,EAAE,UAAU,EAAE,CAAC,EAAE,CAClB,CAAA;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,KAAK,GAAI,UAAkB,CAAC,KAAK,CAAA;QACvC,MAAM,qBAAqB,CAAC,KAAkB,EAAE;YAC9C,GAAI,OAAyB;YAC7B,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3B,SAAS;SACV,CAAC,CAAA;IACJ,CAAC;AACH,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"privateKeyToAccount.js","sourceRoot":"","sources":["../../accounts/privateKeyToAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAGnD,OAAO,EAAuB,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAIvE,OAAO,EAA2B,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAEnE,OAAO,EAEL,kBAAkB,GACnB,MAAM,+BAA+B,CAAA;AACtC,OAAO,EAAsB,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAC1D,OAAO,EAAE,8BAA8B,EAAE,MAAM,8BAA8B,CAAA;AAC7E,OAAO,EAA6B,WAAW,EAAE,MAAM,wBAAwB,CAAA;AAC/E,OAAO,EAEL,eAAe,GAChB,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAEL,aAAa,GACd,MAAM,0BAA0B,CAAA;AAgBjC;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CACjC,UAAe,EACf,UAAsC,EAAE;IAExC,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAA;IAChC,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC,YAAY,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAA;IAC3E,MAAM,OAAO,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAA;IAE7C,MAAM,OAAO,GAAG,SAAS,CAAC;QACxB,OAAO;QACP,YAAY;QACZ,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE;YACjB,OAAO,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;QAC9C,CAAC;QACD,KAAK,CAAC,8BAA8B,CAAC,aAAa;YAChD,OAAO,8BAA8B,CAAC,EAAE,GAAG,aAAa,EAAE,UAAU,EAAE,CAAC,CAAA;QACzE,CAAC;QACD,KAAK,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE;YAC3B,OAAO,WAAW,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,CAAA;QAC7C,CAAC;QACD,KAAK,CAAC,eAAe,CAAC,WAAW,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE;YACpD,OAAO,eAAe,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,CAAA;QACjE,CAAC;QACD,KAAK,CAAC,aAAa,CAAC,SAAS;YAC3B,OAAO,aAAa,CAAC,EAAE,GAAG,SAAS,EAAE,UAAU,EAAE,CAAC,CAAA;QACpD,CAAC;KACF,CAAC,CAAA;IAEF,OAAO;QACL,GAAG,OAAO;QACV,SAAS;QACT,MAAM,EAAE,YAAY;KACA,CAAA;AACxB,CAAC"}
1
+ {"version":3,"file":"privateKeyToAccount.js","sourceRoot":"","sources":["../../accounts/privateKeyToAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAGnD,OAAO,EAAuB,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAIvE,OAAO,EAA2B,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAEnE,OAAO,EAEL,kBAAkB,GACnB,MAAM,+BAA+B,CAAA;AACtC,OAAO,EAAsB,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAC1D,OAAO,EAAE,8BAA8B,EAAE,MAAM,8BAA8B,CAAA;AAC7E,OAAO,EAA6B,WAAW,EAAE,MAAM,wBAAwB,CAAA;AAC/E,OAAO,EAEL,eAAe,GAChB,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAEL,aAAa,GACd,MAAM,0BAA0B,CAAA;AAgBjC;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CACjC,UAAe,EACf,UAAsC,EAAE;IAExC,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAA;IAChC,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC,YAAY,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAA;IAC3E,MAAM,OAAO,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAA;IAE7C,MAAM,OAAO,GAAG,SAAS,CAAC;QACxB,OAAO;QACP,YAAY;QACZ,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE;YACjB,OAAO,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;QAC9C,CAAC;QACD,KAAK,CAAC,8BAA8B,CAAC,aAAa;YAChD,OAAO,8BAA8B,CAAC,EAAE,GAAG,aAAa,EAAE,UAAU,EAAE,CAAC,CAAA;QACzE,CAAC;QACD,KAAK,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE;YAC3B,OAAO,WAAW,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,CAAA;QAC7C,CAAC;QACD,KAAK,CAAC,eAAe,CAAC,WAAW,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE;YACpD,OAAO,eAAe,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,CAAA;QACjE,CAAC;QACD,KAAK,CAAC,aAAa,CAAC,SAAS;YAC3B,OAAO,aAAa,CAAC,EAAE,GAAG,SAAS,EAAE,UAAU,EAAS,CAAC,CAAA;QAC3D,CAAC;KACF,CAAC,CAAA;IAEF,OAAO;QACL,GAAG,OAAO;QACV,SAAS;QACT,MAAM,EAAE,YAAY;KACA,CAAA;AACxB,CAAC"}
@@ -22,9 +22,15 @@
22
22
  * })
23
23
  */
24
24
  export async function setCode(client, { address, bytecode }) {
25
- await client.request({
26
- method: `${client.mode}_setCode`,
27
- params: [address, bytecode],
28
- });
25
+ if (client.mode === 'ganache')
26
+ await client.request({
27
+ method: 'evm_setAccountCode',
28
+ params: [address, bytecode],
29
+ });
30
+ else
31
+ await client.request({
32
+ method: `${client.mode}_setCode`,
33
+ params: [address, bytecode],
34
+ });
29
35
  }
30
36
  //# sourceMappingURL=setCode.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"setCode.js","sourceRoot":"","sources":["../../../actions/test/setCode.ts"],"names":[],"mappings":"AAsBA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAI3B,MAAoE,EACpE,EAAE,OAAO,EAAE,QAAQ,EAAqB;IAExC,MAAM,MAAM,CAAC,OAAO,CAAC;QACnB,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,UAAU;QAChC,MAAM,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC;KAC5B,CAAC,CAAA;AACJ,CAAC"}
1
+ {"version":3,"file":"setCode.js","sourceRoot":"","sources":["../../../actions/test/setCode.ts"],"names":[],"mappings":"AAsBA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAI3B,MAAoE,EACpE,EAAE,OAAO,EAAE,QAAQ,EAAqB;IAExC,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS;QAC3B,MAAM,MAAM,CAAC,OAAO,CAAC;YACnB,MAAM,EAAE,oBAAoB;YAC5B,MAAM,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC;SAC5B,CAAC,CAAA;;QAEF,MAAM,MAAM,CAAC,OAAO,CAAC;YACnB,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,UAAU;YAChC,MAAM,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC;SAC5B,CAAC,CAAA;AACN,CAAC"}
@@ -1,2 +1,2 @@
1
- export const version = '2.19.8';
1
+ export const version = '2.20.0';
2
2
  //# sourceMappingURL=version.js.map
@@ -1,6 +1,7 @@
1
1
  import { parseAccount } from '../../../accounts/utils/parseAccount.js';
2
2
  import { AccountNotFoundError } from '../../../errors/account.js';
3
3
  import { ChainNotFoundError } from '../../../errors/chain.js';
4
+ import { encodeFunctionData } from '../../../utils/abi/encodeFunctionData.js';
4
5
  import { numberToHex } from '../../../utils/encoding/toHex.js';
5
6
  import { getTransactionError } from '../../../utils/errors/getTransactionError.js';
6
7
  /**
@@ -36,23 +37,37 @@ import { getTransactionError } from '../../../utils/errors/getTransactionError.j
36
37
  * })
37
38
  */
38
39
  export async function sendCalls(client, parameters) {
39
- const { account: account_ = client.account, calls, capabilities, chain = client.chain, version = '1.0', } = parameters;
40
+ const { account: account_ = client.account, capabilities, chain = client.chain, version = '1.0', } = parameters;
40
41
  if (!account_)
41
42
  throw new AccountNotFoundError({
42
43
  docsPath: '/experimental/eip5792/sendCalls',
43
44
  });
44
45
  const account = parseAccount(account_);
45
- if (!chain)
46
- throw new ChainNotFoundError();
46
+ const calls = parameters.calls.map((call_) => {
47
+ const call = call_;
48
+ const chainId = call.chain?.id ?? call.chainId ?? chain?.id;
49
+ if (!chainId)
50
+ throw new ChainNotFoundError();
51
+ const data = call.abi
52
+ ? encodeFunctionData({
53
+ abi: call.abi,
54
+ functionName: call.functionName,
55
+ args: call.args,
56
+ })
57
+ : call.data;
58
+ return {
59
+ chainId: numberToHex(chainId),
60
+ data,
61
+ to: call.to,
62
+ value: call.value ? numberToHex(call.value) : undefined,
63
+ };
64
+ });
47
65
  try {
48
66
  return await client.request({
49
67
  method: 'wallet_sendCalls',
50
68
  params: [
51
69
  {
52
- calls: calls.map((call) => ({
53
- ...call,
54
- value: call.value ? numberToHex(call.value) : undefined,
55
- })),
70
+ calls,
56
71
  capabilities,
57
72
  chainId: numberToHex(chain.id),
58
73
  from: account.address,
@@ -1 +1 @@
1
- {"version":3,"file":"sendCalls.js","sourceRoot":"","sources":["../../../../experimental/eip5792/actions/sendCalls.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAA;AAGtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAA;AAEjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAW7D,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAA;AA4BlF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,MAAM,CAAC,KAAK,UAAU,SAAS,CAK7B,MAAyC,EACzC,UAA8D;IAE9D,MAAM,EACJ,OAAO,EAAE,QAAQ,GAAG,MAAM,CAAC,OAAO,EAClC,KAAK,EACL,YAAY,EACZ,KAAK,GAAG,MAAM,CAAC,KAAK,EACpB,OAAO,GAAG,KAAK,GAChB,GAAG,UAAU,CAAA;IAEd,IAAI,CAAC,QAAQ;QACX,MAAM,IAAI,oBAAoB,CAAC;YAC7B,QAAQ,EAAE,iCAAiC;SAC5C,CAAC,CAAA;IACJ,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAA;IAEtC,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,kBAAkB,EAAE,CAAA;IAE1C,IAAI,CAAC;QACH,OAAO,MAAM,MAAM,CAAC,OAAO,CACzB;YACE,MAAM,EAAE,kBAAkB;YAC1B,MAAM,EAAE;gBACN;oBACE,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;wBAC1B,GAAG,IAAI;wBACP,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;qBACxD,CAAC,CAAQ;oBACV,YAAY;oBACZ,OAAO,EAAE,WAAW,CAAC,KAAM,CAAC,EAAE,CAAC;oBAC/B,IAAI,EAAE,OAAO,CAAC,OAAO;oBACrB,OAAO;iBACR;aACF;SACF,EACD,EAAE,UAAU,EAAE,CAAC,EAAE,CAClB,CAAA;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,mBAAmB,CAAC,GAAgB,EAAE;YAC1C,GAAG,UAAU;YACb,OAAO;YACP,KAAK,EAAE,UAAU,CAAC,KAAM;SACzB,CAAC,CAAA;IACJ,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"sendCalls.js","sourceRoot":"","sources":["../../../../experimental/eip5792/actions/sendCalls.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAA;AAGtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAA;AAEjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAY7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAA;AAE7E,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAA;AAsBlF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,MAAM,CAAC,KAAK,UAAU,SAAS,CAM7B,MAAyC,EACzC,UAAqE;IAErE,MAAM,EACJ,OAAO,EAAE,QAAQ,GAAG,MAAM,CAAC,OAAO,EAClC,YAAY,EACZ,KAAK,GAAG,MAAM,CAAC,KAAK,EACpB,OAAO,GAAG,KAAK,GAChB,GAAG,UAAU,CAAA;IAEd,IAAI,CAAC,QAAQ;QACX,MAAM,IAAI,oBAAoB,CAAC;YAC7B,QAAQ,EAAE,iCAAiC;SAC5C,CAAC,CAAA;IACJ,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAA;IAEtC,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAc,EAAE,EAAE;QACpD,MAAM,IAAI,GAAG,KAAa,CAAA;QAE1B,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,EAAE,EAAE,IAAI,IAAI,CAAC,OAAO,IAAI,KAAK,EAAE,EAAE,CAAA;QAC3D,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,kBAAkB,EAAE,CAAA;QAE5C,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG;YACnB,CAAC,CAAC,kBAAkB,CAAC;gBACjB,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,IAAI,EAAE,IAAI,CAAC,IAAI;aAChB,CAAC;YACJ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAA;QAEb,OAAO;YACL,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC;YAC7B,IAAI;YACJ,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;SACxD,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC;QACH,OAAO,MAAM,MAAM,CAAC,OAAO,CACzB;YACE,MAAM,EAAE,kBAAkB;YAC1B,MAAM,EAAE;gBACN;oBACE,KAAK;oBACL,YAAY;oBACZ,OAAO,EAAE,WAAW,CAAC,KAAM,CAAC,EAAE,CAAC;oBAC/B,IAAI,EAAE,OAAO,CAAC,OAAO;oBACrB,OAAO;iBACR;aACF;SACF,EACD,EAAE,UAAU,EAAE,CAAC,EAAE,CAClB,CAAA;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,mBAAmB,CAAC,GAAgB,EAAE;YAC1C,GAAG,UAAU;YACb,OAAO;YACP,KAAK,EAAE,UAAU,CAAC,KAAM;SACzB,CAAC,CAAA;IACJ,CAAC;AACH,CAAC"}
@@ -2,6 +2,8 @@ import { encodeFunctionData, } from '../../../utils/abi/encodeFunctionData.js';
2
2
  import { getAction } from '../../../utils/getAction.js';
3
3
  import { sendCalls, } from './sendCalls.js';
4
4
  /**
5
+ * @deprecated Use {@link sendCalls} instead. See https://viem.sh/experimental/eip5792/sendCalls#contract-calls.
6
+ *
5
7
  * Requests for the wallet to sign and broadcast a batch of write contract calls (transactions) to the network.
6
8
  *
7
9
  * - Docs: https://viem.sh/experimental/eip5792/writeContracts
@@ -1 +1 @@
1
- {"version":3,"file":"writeContracts.js","sourceRoot":"","sources":["../../../../experimental/eip5792/actions/writeContracts.ts"],"names":[],"mappings":"AAeA,OAAO,EAEL,kBAAkB,GACnB,MAAM,0CAA0C,CAAA;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AACvD,OAAO,EAIL,SAAS,GACV,MAAM,gBAAgB,CAAA;AA0BvB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAMlC,MAAgC,EAChC,UAKC;IAED,MAAM,SAAS,GAAG,UAAU,CAAC,SAA8C,CAAA;IAC3E,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QACvC,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,QAAQ,CAAA;QAC5D,OAAO;YACL,IAAI,EAAE,kBAAkB,CAAC;gBACvB,GAAG;gBACH,YAAY;gBACZ,IAAI;aACL,CAAC;YACF,EAAE,EAAE,OAAO;YACX,KAAK;SACyC,CAAA;IAClD,CAAC,CAAC,CAAA;IACF,OAAO,SAAS,CACd,MAAM,EACN,SAAS,EACT,WAAW,CACZ,CAAC,EAAE,GAAG,UAAU,EAAE,KAAK,EAAyB,CAAC,CAAA;AACpD,CAAC"}
1
+ {"version":3,"file":"writeContracts.js","sourceRoot":"","sources":["../../../../experimental/eip5792/actions/writeContracts.ts"],"names":[],"mappings":"AAeA,OAAO,EAEL,kBAAkB,GACnB,MAAM,0CAA0C,CAAA;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AACvD,OAAO,EAIL,SAAS,GACV,MAAM,gBAAgB,CAAA;AA0BvB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4CG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAMlC,MAAgC,EAChC,UAKC;IAED,MAAM,SAAS,GAAG,UAAU,CAAC,SAA8C,CAAA;IAC3E,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QACvC,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,QAAQ,CAAA;QAC5D,OAAO;YACL,IAAI,EAAE,kBAAkB,CAAC;gBACvB,GAAG;gBACH,YAAY;gBACZ,IAAI;aACL,CAAC;YACF,EAAE,EAAE,OAAO;YACX,KAAK;SACyC,CAAA;IAClD,CAAC,CAAC,CAAA;IACF,OAAO,SAAS,CACd,MAAM,EACN,SAAS,EACT,WAAW,CACZ,CAAC,EAAE,GAAG,UAAU,EAAE,KAAK,EAAyB,CAAC,CAAA;AACpD,CAAC"}
@@ -80,11 +80,17 @@ export async function getTimeToFinalize(client, parameters) {
80
80
  const timestamp = Date.now() + seconds * 1000;
81
81
  return { period: Number(period), seconds, timestamp };
82
82
  }
83
+ const numProofSubmitters = await readContract(client, {
84
+ abi: portal2Abi,
85
+ address: portalAddress,
86
+ functionName: 'numProofSubmitters',
87
+ args: [withdrawalHash],
88
+ }).catch(() => 1n);
83
89
  const proofSubmitter = await readContract(client, {
84
90
  abi: portal2Abi,
85
91
  address: portalAddress,
86
92
  functionName: 'proofSubmitters',
87
- args: [withdrawalHash, 0n],
93
+ args: [withdrawalHash, numProofSubmitters - 1n],
88
94
  }).catch(() => undefined);
89
95
  const [[_disputeGameProxy, proveTimestamp], proofMaturityDelaySeconds] = await Promise.all([
90
96
  proofSubmitter
@@ -1 +1 @@
1
- {"version":3,"file":"getTimeToFinalize.js","sourceRoot":"","sources":["../../../op-stack/actions/getTimeToFinalize.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getTimeToFinalize.js","sourceRoot":"","sources":["../../../op-stack/actions/getTimeToFinalize.ts"],"names":[],"mappings":"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"}
@@ -102,11 +102,17 @@ export async function getWithdrawalStatus(client, parameters) {
102
102
  const { seconds } = timeToFinalizeResult.value;
103
103
  return seconds > 0 ? 'waiting-to-finalize' : 'ready-to-finalize';
104
104
  }
105
+ const numProofSubmitters = await readContract(client, {
106
+ abi: portal2Abi,
107
+ address: portalAddress,
108
+ functionName: 'numProofSubmitters',
109
+ args: [withdrawal.withdrawalHash],
110
+ }).catch(() => 1n);
105
111
  const proofSubmitter = await readContract(client, {
106
112
  abi: portal2Abi,
107
113
  address: portalAddress,
108
114
  functionName: 'proofSubmitters',
109
- args: [withdrawal.withdrawalHash, 0n],
115
+ args: [withdrawal.withdrawalHash, numProofSubmitters - 1n],
110
116
  }).catch(() => withdrawal.sender);
111
117
  const [disputeGameResult, checkWithdrawalResult, finalizedResult] = await Promise.allSettled([
112
118
  getGame(client, {
@@ -1 +1 @@
1
- {"version":3,"file":"getWithdrawalStatus.js","sourceRoot":"","sources":["../../../op-stack/actions/getWithdrawalStatus.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getWithdrawalStatus.js","sourceRoot":"","sources":["../../../op-stack/actions/getWithdrawalStatus.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,17 @@
1
+ import { sign } from '../../accounts/utils/sign.js';
2
+ import { concatHex } from '../../utils/index.js';
3
+ import { toSmartAccount } from './toSmartAccount.js';
4
+ /**
5
+ * Creates a [ZKsync Smart Account](https://docs.zksync.io/build/developer-reference/account-abstraction/building-smart-accounts)
6
+ * from a Contract Address and an array of Private Keys belonging to the owners.
7
+ */
8
+ export function toMultisigSmartAccount(parameters) {
9
+ const { address, privateKeys } = parameters;
10
+ return toSmartAccount({
11
+ address,
12
+ async sign({ hash }) {
13
+ return concatHex(await Promise.all(privateKeys.map((privateKey) => sign({ hash, privateKey, to: 'hex' }))));
14
+ },
15
+ });
16
+ }
17
+ //# sourceMappingURL=toMultisigSmartAccount.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"toMultisigSmartAccount.js","sourceRoot":"","sources":["../../../zksync/accounts/toMultisigSmartAccount.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAA;AAEnD,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAEhD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AASpD;;;GAGG;AACH,MAAM,UAAU,sBAAsB,CACpC,UAA4C;IAE5C,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,UAAU,CAAA;IAE3C,OAAO,cAAc,CAAC;QACpB,OAAO;QACP,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE;YACjB,OAAO,SAAS,CACd,MAAM,OAAO,CAAC,GAAG,CACf,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAC7B,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CACtC,CACF,CACF,CAAA;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC"}
@@ -0,0 +1,16 @@
1
+ import { sign } from '../../accounts/utils/sign.js';
2
+ import { toSmartAccount } from './toSmartAccount.js';
3
+ /**
4
+ * Creates a [ZKsync Smart Account](https://docs.zksync.io/build/developer-reference/account-abstraction/building-smart-accounts)
5
+ * from a Contract Address and a Private Key belonging to the owner.
6
+ */
7
+ export function toSinglesigSmartAccount(parameters) {
8
+ const { address, privateKey } = parameters;
9
+ return toSmartAccount({
10
+ address,
11
+ async sign({ hash }) {
12
+ return sign({ hash, privateKey, to: 'hex' });
13
+ },
14
+ });
15
+ }
16
+ //# sourceMappingURL=toSinglesigSmartAccount.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"toSinglesigSmartAccount.js","sourceRoot":"","sources":["../../../zksync/accounts/toSinglesigSmartAccount.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAA;AAGnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AASpD;;;GAGG;AACH,MAAM,UAAU,uBAAuB,CACrC,UAA6C;IAE7C,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,UAAU,CAAA;IAE1C,OAAO,cAAc,CAAC;QACpB,OAAO;QACP,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE;YACjB,OAAO,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;QAC9C,CAAC;KACF,CAAC,CAAA;AACJ,CAAC"}
@@ -0,0 +1,43 @@
1
+ import { toAccount } from '../../accounts/toAccount.js';
2
+ import { keccak256 } from '../../utils/index.js';
3
+ import { hashMessage } from '../../utils/signature/hashMessage.js';
4
+ import { hashTypedData } from '../../utils/signature/hashTypedData.js';
5
+ import { serializeTransaction } from '../serializers.js';
6
+ /**
7
+ * Creates a [ZKsync Smart Account](https://docs.zksync.io/build/developer-reference/account-abstraction/building-smart-accounts)
8
+ * from a Contract Address and a custom sign function.
9
+ */
10
+ export function toSmartAccount(parameters) {
11
+ const { address, sign } = parameters;
12
+ const account = toAccount({
13
+ address,
14
+ sign,
15
+ async signMessage({ message }) {
16
+ return sign({
17
+ hash: hashMessage(message),
18
+ });
19
+ },
20
+ async signTransaction(transaction) {
21
+ const signableTransaction = {
22
+ ...transaction,
23
+ from: this.address,
24
+ };
25
+ return serializeTransaction({
26
+ ...signableTransaction,
27
+ customSignature: await sign({
28
+ hash: keccak256(serializeTransaction(signableTransaction)),
29
+ }),
30
+ });
31
+ },
32
+ async signTypedData(typedData) {
33
+ return sign({
34
+ hash: hashTypedData(typedData),
35
+ });
36
+ },
37
+ });
38
+ return {
39
+ ...account,
40
+ source: 'smartAccountZksync',
41
+ };
42
+ }
43
+ //# sourceMappingURL=toSmartAccount.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"toSmartAccount.js","sourceRoot":"","sources":["../../../zksync/accounts/toSmartAccount.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AAGvD,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAA;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAA;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AAaxD;;;GAGG;AACH,MAAM,UAAU,cAAc,CAC5B,UAAoC;IAEpC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,UAAU,CAAA;IAEpC,MAAM,OAAO,GAAG,SAAS,CAAC;QACxB,OAAO;QACP,IAAI;QACJ,KAAK,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE;YAC3B,OAAO,IAAI,CAAC;gBACV,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC;aAC3B,CAAC,CAAA;QACJ,CAAC;QACD,KAAK,CAAC,eAAe,CAAC,WAAW;YAC/B,MAAM,mBAAmB,GAAG;gBAC1B,GAAG,WAAW;gBACd,IAAI,EAAE,IAAI,CAAC,OAAQ;aACmB,CAAA;YAExC,OAAO,oBAAoB,CAAC;gBAC1B,GAAG,mBAAmB;gBACtB,eAAe,EAAE,MAAM,IAAI,CAAC;oBAC1B,IAAI,EAAE,SAAS,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,CAAC;iBAC3D,CAAC;aACH,CAAC,CAAA;QACJ,CAAC;QACD,KAAK,CAAC,aAAa,CAAC,SAAS;YAC3B,OAAO,IAAI,CAAC;gBACV,IAAI,EAAE,aAAa,CAAC,SAAS,CAAC;aAC/B,CAAC,CAAA;QACJ,CAAC;KACF,CAAC,CAAA;IAEF,OAAO;QACL,GAAG,OAAO;QACV,MAAM,EAAE,oBAAoB;KACP,CAAA;AACzB,CAAC"}
@@ -1,4 +1,7 @@
1
1
  // biome-ignore lint/performance/noBarrelFile: entrypoint module
2
+ export { toSmartAccount, } from './accounts/toSmartAccount.js';
3
+ export { toMultisigSmartAccount, } from './accounts/toMultisigSmartAccount.js';
4
+ export { toSinglesigSmartAccount, } from './accounts/toSinglesigSmartAccount.js';
2
5
  export { deployContract, } from './actions/deployContract.js';
3
6
  export { estimateFee, } from './actions/estimateFee.js';
4
7
  export { getAllBalances, } from './actions/getAllBalances.js';
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../zksync/index.ts"],"names":[],"mappings":"AAAA,gEAAgE;AAChE,OAAO,EAIL,cAAc,GACf,MAAM,6BAA6B,CAAA;AACpC,OAAO,EAGL,WAAW,GACZ,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAGL,cAAc,GACf,MAAM,6BAA6B,CAAA;AACpC,OAAO,EAGL,eAAe,GAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAEL,yBAAyB,GAC1B,MAAM,wCAAwC,CAAA;AAC/C,OAAO,EAAE,2BAA2B,EAAE,MAAM,0CAA0C,CAAA;AACtF,OAAO,EAIL,cAAc,GACf,MAAM,6BAA6B,CAAA;AACpC,OAAO,EAIL,YAAY,GACb,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAGL,oBAAoB,GACrB,MAAM,mCAAmC,CAAA;AAC1C,OAAO,EAGL,iBAAiB,GAClB,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AACxD,OAAO,EAIL,iBAAiB,GAClB,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAGL,WAAW,GACZ,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAA;AAC5E,OAAO,EAGL,uBAAuB,GACxB,MAAM,sCAAsC,CAAA;AAC7C,OAAO,EAAE,0BAA0B,EAAE,MAAM,yCAAyC,CAAA;AACpF,OAAO,EAGL,qBAAqB,GACtB,MAAM,oCAAoC,CAAA;AAC3C,OAAO,EAIL,eAAe,GAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAIL,qBAAqB,GACtB,MAAM,oCAAoC,CAAA;AAC3C,OAAO,EAIL,qBAAqB,GACtB,MAAM,oCAAoC,CAAA;AAC3C,OAAO,EAIL,eAAe,GAChB,MAAM,8BAA8B,CAAA;AAErC,OAAO;AACL,uCAAuC;AACvC,MAAM,IAAI,MAAM,EAChB,MAAM;AACN,uCAAuC;AACvC,kBAAkB,IAAI,kBAAkB,EACxC,kBAAkB;AAClB,uCAAuC;AACvC,eAAe,IAAI,eAAe,EAClC,eAAe;AACf,uCAAuC;AACvC,oBAAoB,IAAI,oBAAoB,EAC5C,oBAAoB,GACrB,MAAM,aAAa,CAAA;AAEpB,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAE9C,OAAO,EACL,mBAAmB,GAEpB,MAAM,wBAAwB,CAAA;AAE/B,OAAO,EACL,eAAe,GAEhB,MAAM,0BAA0B,CAAA;AAEjC,OAAO,EACL,eAAe,GAEhB,MAAM,0BAA0B,CAAA;AAEjC,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AAsHvD,OAAO,EAGL,8BAA8B,GAC/B,MAAM,qDAAqD,CAAA;AAC5D,OAAO,EAGL,wBAAwB,GACzB,MAAM,+CAA+C,CAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../zksync/index.ts"],"names":[],"mappings":"AAAA,gEAAgE;AAChE,OAAO,EAGL,cAAc,GACf,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAEL,sBAAsB,GACvB,MAAM,sCAAsC,CAAA;AAC7C,OAAO,EAEL,uBAAuB,GACxB,MAAM,uCAAuC,CAAA;AAE9C,OAAO,EAIL,cAAc,GACf,MAAM,6BAA6B,CAAA;AACpC,OAAO,EAGL,WAAW,GACZ,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAGL,cAAc,GACf,MAAM,6BAA6B,CAAA;AACpC,OAAO,EAGL,eAAe,GAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAEL,yBAAyB,GAC1B,MAAM,wCAAwC,CAAA;AAC/C,OAAO,EAAE,2BAA2B,EAAE,MAAM,0CAA0C,CAAA;AACtF,OAAO,EAIL,cAAc,GACf,MAAM,6BAA6B,CAAA;AACpC,OAAO,EAIL,YAAY,GACb,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAGL,oBAAoB,GACrB,MAAM,mCAAmC,CAAA;AAC1C,OAAO,EAGL,iBAAiB,GAClB,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AACxD,OAAO,EAIL,iBAAiB,GAClB,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAGL,WAAW,GACZ,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAA;AAC5E,OAAO,EAGL,uBAAuB,GACxB,MAAM,sCAAsC,CAAA;AAC7C,OAAO,EAAE,0BAA0B,EAAE,MAAM,yCAAyC,CAAA;AACpF,OAAO,EAGL,qBAAqB,GACtB,MAAM,oCAAoC,CAAA;AAC3C,OAAO,EAIL,eAAe,GAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAIL,qBAAqB,GACtB,MAAM,oCAAoC,CAAA;AAC3C,OAAO,EAIL,qBAAqB,GACtB,MAAM,oCAAoC,CAAA;AAC3C,OAAO,EAIL,eAAe,GAChB,MAAM,8BAA8B,CAAA;AAErC,OAAO;AACL,uCAAuC;AACvC,MAAM,IAAI,MAAM,EAChB,MAAM;AACN,uCAAuC;AACvC,kBAAkB,IAAI,kBAAkB,EACxC,kBAAkB;AAClB,uCAAuC;AACvC,eAAe,IAAI,eAAe,EAClC,eAAe;AACf,uCAAuC;AACvC,oBAAoB,IAAI,oBAAoB,EAC5C,oBAAoB,GACrB,MAAM,aAAa,CAAA;AAEpB,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAE9C,OAAO,EACL,mBAAmB,GAEpB,MAAM,wBAAwB,CAAA;AAE/B,OAAO,EACL,eAAe,GAEhB,MAAM,0BAA0B,CAAA;AAEjC,OAAO,EACL,eAAe,GAEhB,MAAM,0BAA0B,CAAA;AAEjC,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AAuHvD,OAAO,EAGL,8BAA8B,GAC/B,MAAM,qDAAqD,CAAA;AAC5D,OAAO,EAGL,wBAAwB,GACzB,MAAM,+CAA+C,CAAA"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=account.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"account.js","sourceRoot":"","sources":["../../../zksync/types/account.ts"],"names":[],"mappings":""}
@@ -1 +1 @@
1
- {"version":3,"file":"toSmartAccount.d.ts","sourceRoot":"","sources":["../../../account-abstraction/accounts/toSmartAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAY,MAAM,SAAS,CAAA;AAI5C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAIpD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AACtE,OAAO,KAAK,EAAE,YAAY,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAA;AAE1E,MAAM,MAAM,wBAAwB,CAClC,aAAa,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,GAAG,GAAG,EACpD,iBAAiB,SAAS,iBAAiB,GAAG,iBAAiB,EAC/D,MAAM,SAAS,MAAM,GAAG,MAAM,IAC5B,0BAA0B,CAAC,aAAa,EAAE,iBAAiB,EAAE,MAAM,CAAC,CAAA;AAExE,MAAM,MAAM,wBAAwB,CAClC,cAAc,SACZ,0BAA0B,GAAG,0BAA0B,IACvD,QAAQ,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,CAAA;AAE1C;;;;;GAKG;AACH,wBAAsB,cAAc,CAClC,cAAc,SAAS,0BAA0B,EAEjD,cAAc,EAAE,cAAc,GAC7B,OAAO,CAAC,wBAAwB,CAAC,cAAc,CAAC,CAAC,CA0GnD"}
1
+ {"version":3,"file":"toSmartAccount.d.ts","sourceRoot":"","sources":["../../../account-abstraction/accounts/toSmartAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAY,MAAM,SAAS,CAAA;AAI5C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAIpD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AACtE,OAAO,KAAK,EAAE,YAAY,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAA;AAE1E,MAAM,MAAM,wBAAwB,CAClC,aAAa,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,GAAG,GAAG,EACpD,iBAAiB,SAAS,iBAAiB,GAAG,iBAAiB,EAC/D,MAAM,SAAS,MAAM,GAAG,MAAM,IAC5B,0BAA0B,CAAC,aAAa,EAAE,iBAAiB,EAAE,MAAM,CAAC,CAAA;AAExE,MAAM,MAAM,wBAAwB,CAClC,cAAc,SACZ,0BAA0B,GAAG,0BAA0B,IACvD,QAAQ,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,CAAA;AAE1C;;;;;GAKG;AACH,wBAAsB,cAAc,CAClC,cAAc,SAAS,0BAA0B,EAEjD,cAAc,EAAE,cAAc,GAC7B,OAAO,CAAC,wBAAwB,CAAC,cAAc,CAAC,CAAC,CA4GnD"}
@@ -4,6 +4,7 @@ import type { Client } from '../../clients/createClient.js';
4
4
  import type { Hash, Hex, SignableMessage } from '../../types/misc.js';
5
5
  import type { TypedDataDefinition } from '../../types/typedData.js';
6
6
  import type { Assign, ExactPartial, UnionPartialBy } from '../../types/utils.js';
7
+ import type { NonceManager } from '../../utils/nonceManager.js';
7
8
  import type { EntryPointVersion } from '../types/entryPointVersion.js';
8
9
  import type { EstimateUserOperationGasReturnType, UserOperation, UserOperationRequest } from '../types/userOperation.js';
9
10
  type Call = {
@@ -89,6 +90,8 @@ export type SmartAccountImplementation<entryPointAbi extends Abi | readonly unkn
89
90
  * ```
90
91
  */
91
92
  getStubSignature: () => Promise<Hex>;
93
+ /** Custom nonce key manager. */
94
+ nonceKeyManager?: NonceManager | undefined;
92
95
  /**
93
96
  * Signs a hash via the Smart Account's owner.
94
97
  *
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../account-abstraction/accounts/types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../account-abstraction/accounts/types.ts"],"names":[],"mappings":"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"}
@@ -5,17 +5,17 @@ import type { Transport } from '../../../clients/transports/createTransport.js';
5
5
  import type { ErrorType } from '../../../errors/utils.js';
6
6
  import type { Chain } from '../../../types/chain.js';
7
7
  import type { Hex } from '../../../types/misc.js';
8
- import type { Assign, OneOf, Prettify } from '../../../types/utils.js';
8
+ import type { Assign, MaybeRequired, OneOf, Prettify } from '../../../types/utils.js';
9
9
  import type { RequestErrorType } from '../../../utils/buildRequest.js';
10
10
  import type { SmartAccount } from '../../accounts/types.js';
11
11
  import type { PaymasterActions } from '../../clients/decorators/paymaster.js';
12
12
  import type { DeriveSmartAccount, GetSmartAccountParameter } from '../../types/account.js';
13
13
  import type { DeriveEntryPointVersion, EntryPointVersion } from '../../types/entryPointVersion.js';
14
- import type { EstimateUserOperationGasReturnType as EstimateUserOperationGasReturnType_, UserOperationCalls, UserOperationRequest } from '../../types/userOperation.js';
14
+ import type { EstimateUserOperationGasReturnType as EstimateUserOperationGasReturnType_, UserOperation, UserOperationCalls, UserOperationRequest } from '../../types/userOperation.js';
15
15
  import { type FormatUserOperationGasErrorType } from '../../utils/formatters/userOperationGas.js';
16
16
  import { type FormatUserOperationRequestErrorType } from '../../utils/formatters/userOperationRequest.js';
17
17
  import { type PrepareUserOperationErrorType } from './prepareUserOperation.js';
18
- export type EstimateUserOperationGasParameters<account extends SmartAccount | undefined = SmartAccount | undefined, accountOverride extends SmartAccount | undefined = SmartAccount | undefined, calls extends readonly unknown[] = readonly unknown[], _derivedAccount extends SmartAccount | undefined = DeriveSmartAccount<account, accountOverride>, _derivedVersion extends EntryPointVersion = DeriveEntryPointVersion<_derivedAccount>> = Assign<UserOperationRequest<_derivedVersion>, OneOf<{
18
+ export type EstimateUserOperationGasParameters<account extends SmartAccount | undefined = SmartAccount | undefined, accountOverride extends SmartAccount | undefined = SmartAccount | undefined, calls extends readonly unknown[] = readonly unknown[], _derivedAccount extends SmartAccount | undefined = DeriveSmartAccount<account, accountOverride>, _derivedVersion extends EntryPointVersion = DeriveEntryPointVersion<_derivedAccount>> = GetSmartAccountParameter<account, accountOverride, false> & (UserOperation | Assign<UserOperationRequest<_derivedVersion>, OneOf<{
19
19
  calls: UserOperationCalls<Narrow<calls>>;
20
20
  } | {
21
21
  callData: Hex;
@@ -28,7 +28,9 @@ export type EstimateUserOperationGasParameters<account extends SmartAccount | un
28
28
  } | undefined;
29
29
  /** Paymaster context to pass to `getPaymasterData` and `getPaymasterStubData` calls. */
30
30
  paymasterContext?: unknown | undefined;
31
- }> & GetSmartAccountParameter<account, accountOverride>;
31
+ }>) & MaybeRequired<{
32
+ entryPointAddress?: Address;
33
+ }, _derivedAccount extends undefined ? true : false>;
32
34
  export type EstimateUserOperationGasReturnType<account extends SmartAccount | undefined = SmartAccount | undefined, accountOverride extends SmartAccount | undefined = SmartAccount | undefined, _derivedAccount extends SmartAccount | undefined = DeriveSmartAccount<account, accountOverride>, _derivedVersion extends EntryPointVersion = DeriveEntryPointVersion<_derivedAccount>> = Prettify<EstimateUserOperationGasReturnType_<_derivedVersion>>;
33
35
  export type EstimateUserOperationGasErrorType = ParseAccountErrorType | PrepareUserOperationErrorType | FormatUserOperationRequestErrorType | FormatUserOperationGasErrorType | RequestErrorType | ErrorType;
34
36
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"estimateUserOperationGas.d.ts","sourceRoot":"","sources":["../../../../account-abstraction/actions/bundler/estimateUserOperationGas.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"estimateUserOperationGas.d.ts","sourceRoot":"","sources":["../../../../account-abstraction/actions/bundler/estimateUserOperationGas.ts"],"names":[],"mappings":"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"}
@@ -4,16 +4,16 @@ import type { Transport } from '../../../clients/transports/createTransport.js';
4
4
  import type { ErrorType } from '../../../errors/utils.js';
5
5
  import type { Chain } from '../../../types/chain.js';
6
6
  import type { Hex } from '../../../types/misc.js';
7
- import type { Assign, OneOf } from '../../../types/utils.js';
7
+ import type { Assign, MaybeRequired, OneOf } from '../../../types/utils.js';
8
8
  import type { RequestErrorType } from '../../../utils/buildRequest.js';
9
9
  import type { SmartAccount } from '../../accounts/types.js';
10
10
  import type { PaymasterActions } from '../../clients/decorators/paymaster.js';
11
11
  import type { DeriveSmartAccount, GetSmartAccountParameter } from '../../types/account.js';
12
12
  import type { DeriveEntryPointVersion, EntryPointVersion } from '../../types/entryPointVersion.js';
13
- import type { UserOperationCalls, UserOperationRequest } from '../../types/userOperation.js';
13
+ import type { UserOperation, UserOperationCalls, UserOperationRequest } from '../../types/userOperation.js';
14
14
  import { type FormatUserOperationRequestErrorType } from '../../utils/formatters/userOperationRequest.js';
15
15
  import { type PrepareUserOperationErrorType } from './prepareUserOperation.js';
16
- export type SendUserOperationParameters<account extends SmartAccount | undefined = SmartAccount | undefined, accountOverride extends SmartAccount | undefined = SmartAccount | undefined, calls extends readonly unknown[] = readonly unknown[], _derivedAccount extends SmartAccount | undefined = DeriveSmartAccount<account, accountOverride>, _derivedVersion extends EntryPointVersion = DeriveEntryPointVersion<_derivedAccount>> = Assign<UserOperationRequest<_derivedVersion>, OneOf<{
16
+ export type SendUserOperationParameters<account extends SmartAccount | undefined = SmartAccount | undefined, accountOverride extends SmartAccount | undefined = SmartAccount | undefined, calls extends readonly unknown[] = readonly unknown[], _derivedAccount extends SmartAccount | undefined = DeriveSmartAccount<account, accountOverride>, _derivedVersion extends EntryPointVersion = DeriveEntryPointVersion<_derivedAccount>> = GetSmartAccountParameter<account, accountOverride, false> & (UserOperation | Assign<UserOperationRequest<_derivedVersion>, OneOf<{
17
17
  calls: UserOperationCalls<Narrow<calls>>;
18
18
  } | {
19
19
  callData: Hex;
@@ -25,8 +25,10 @@ export type SendUserOperationParameters<account extends SmartAccount | undefined
25
25
  getPaymasterStubData?: PaymasterActions['getPaymasterStubData'] | undefined;
26
26
  } | undefined;
27
27
  /** Paymaster context to pass to `getPaymasterData` and `getPaymasterStubData` calls. */
28
- paymasterContext?: unknown;
29
- }> & GetSmartAccountParameter<account, accountOverride>;
28
+ paymasterContext?: unknown | undefined;
29
+ }>) & MaybeRequired<{
30
+ entryPointAddress?: Address;
31
+ }, _derivedAccount extends undefined ? true : false>;
30
32
  export type SendUserOperationReturnType = Hex;
31
33
  export type SendUserOperationErrorType = FormatUserOperationRequestErrorType | PrepareUserOperationErrorType | RequestErrorType | ErrorType;
32
34
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"sendUserOperation.d.ts","sourceRoot":"","sources":["../../../../account-abstraction/actions/bundler/sendUserOperation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAE9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAA;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gDAAgD,CAAA;AAG/E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AACzD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AACpD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,wBAAwB,CAAA;AACjD,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAC5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAEtE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAC3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAA;AAC7E,OAAO,KAAK,EACV,kBAAkB,EAClB,wBAAwB,EACzB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,KAAK,EACV,uBAAuB,EACvB,iBAAiB,EAClB,MAAM,kCAAkC,CAAA;AACzC,OAAO,KAAK,EAEV,kBAAkB,EAClB,oBAAoB,EACrB,MAAM,8BAA8B,CAAA;AAErC,OAAO,EACL,KAAK,mCAAmC,EAEzC,MAAM,gDAAgD,CAAA;AACvD,OAAO,EACL,KAAK,6BAA6B,EAGnC,MAAM,2BAA2B,CAAA;AAElC,MAAM,MAAM,2BAA2B,CACrC,OAAO,SAAS,YAAY,GAAG,SAAS,GAAG,YAAY,GAAG,SAAS,EACnE,eAAe,SAAS,YAAY,GAAG,SAAS,GAAG,YAAY,GAAG,SAAS,EAC3E,KAAK,SAAS,SAAS,OAAO,EAAE,GAAG,SAAS,OAAO,EAAE,EAErD,eAAe,SAAS,YAAY,GAAG,SAAS,GAAG,kBAAkB,CACnE,OAAO,EACP,eAAe,CAChB,EACD,eAAe,SACb,iBAAiB,GAAG,uBAAuB,CAAC,eAAe,CAAC,IAC5D,MAAM,CACR,oBAAoB,CAAC,eAAe,CAAC,EACrC,KAAK,CAAC;IAAE,KAAK,EAAE,kBAAkB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;CAAE,GAAG;IAAE,QAAQ,EAAE,GAAG,CAAA;CAAE,CAAC,GAAG;IACxE,SAAS,CAAC,EACN,OAAO,GACP,IAAI,GACJ;QACE,uGAAuG;QACvG,gBAAgB,CAAC,EAAE,gBAAgB,CAAC,kBAAkB,CAAC,GAAG,SAAS,CAAA;QACnE,2FAA2F;QAC3F,oBAAoB,CAAC,EACjB,gBAAgB,CAAC,sBAAsB,CAAC,GACxC,SAAS,CAAA;KACd,GACD,SAAS,CAAA;IACb,wFAAwF;IACxF,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B,CACF,GACC,wBAAwB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAA;AAEpD,MAAM,MAAM,2BAA2B,GAAG,GAAG,CAAA;AAE7C,MAAM,MAAM,0BAA0B,GAClC,mCAAmC,GACnC,6BAA6B,GAC7B,gBAAgB,GAChB,SAAS,CAAA;AAEb;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAsB,iBAAiB,CACrC,KAAK,CAAC,KAAK,SAAS,SAAS,OAAO,EAAE,EACtC,OAAO,SAAS,YAAY,GAAG,SAAS,EACxC,eAAe,SAAS,YAAY,GAAG,SAAS,GAAG,SAAS,EAE5D,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK,GAAG,SAAS,EAAE,OAAO,CAAC,EACrD,UAAU,EAAE,2BAA2B,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,CAAC,0BAqCzE"}
1
+ {"version":3,"file":"sendUserOperation.d.ts","sourceRoot":"","sources":["../../../../account-abstraction/actions/bundler/sendUserOperation.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"setCode.d.ts","sourceRoot":"","sources":["../../../actions/test/setCode.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAEtC,OAAO,KAAK,EACV,UAAU,EACV,cAAc,EACf,MAAM,mCAAmC,CAAA;AAC1C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6CAA6C,CAAA;AAC5E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AACrD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAA;AAC9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAEnE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,2BAA2B;IAC3B,OAAO,EAAE,OAAO,CAAA;IAChB,0BAA0B;IAC1B,QAAQ,EAAE,GAAG,CAAA;CACd,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG,gBAAgB,GAAG,SAAS,CAAA;AAE3D;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAsB,OAAO,CAC3B,KAAK,SAAS,KAAK,GAAG,SAAS,EAC/B,OAAO,SAAS,OAAO,GAAG,SAAS,EAEnC,MAAM,EAAE,UAAU,CAAC,cAAc,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EACpE,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,iBAAiB,iBAMzC"}
1
+ {"version":3,"file":"setCode.d.ts","sourceRoot":"","sources":["../../../actions/test/setCode.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAEtC,OAAO,KAAK,EACV,UAAU,EACV,cAAc,EACf,MAAM,mCAAmC,CAAA;AAC1C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6CAA6C,CAAA;AAC5E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AACrD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAA;AAC9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAEnE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,2BAA2B;IAC3B,OAAO,EAAE,OAAO,CAAA;IAChB,0BAA0B;IAC1B,QAAQ,EAAE,GAAG,CAAA;CACd,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG,gBAAgB,GAAG,SAAS,CAAA;AAE3D;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAsB,OAAO,CAC3B,KAAK,SAAS,KAAK,GAAG,SAAS,EAC/B,OAAO,SAAS,OAAO,GAAG,SAAS,EAEnC,MAAM,EAAE,UAAU,CAAC,cAAc,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EACpE,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,iBAAiB,iBAYzC"}
@@ -1,2 +1,2 @@
1
- export declare const version = "2.19.8";
1
+ export declare const version = "2.20.0";
2
2
  //# sourceMappingURL=version.d.ts.map