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
package/CHANGELOG.md CHANGED
@@ -1,5 +1,31 @@
1
1
  # viem
2
2
 
3
+ ## 2.20.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [#2641](https://github.com/wevm/viem/pull/2641) [`89d11ed`](https://github.com/wevm/viem/commit/89d11edb558656bc3c97f0c410a448f99f92a1f4) Thanks [@jxom](https://github.com/jxom)! - **Experimental:** Deprecated `writeContracts`. Use `sendCalls` instead.
8
+
9
+ - [#2641](https://github.com/wevm/viem/pull/2641) [`89d11ed`](https://github.com/wevm/viem/commit/89d11edb558656bc3c97f0c410a448f99f92a1f4) Thanks [@jxom](https://github.com/jxom)! - **Experimental:** Updated `sendCalls` to match the updated EIP-5792 spec (`chainId` per call).
10
+
11
+ - [#2641](https://github.com/wevm/viem/pull/2641) [`89d11ed`](https://github.com/wevm/viem/commit/89d11edb558656bc3c97f0c410a448f99f92a1f4) Thanks [@jxom](https://github.com/jxom)! - **Experimental:** Updated `sendCalls` to also accept contract function interface.
12
+
13
+ ### Patch Changes
14
+
15
+ - [#2638](https://github.com/wevm/viem/pull/2638) [`9cbd082`](https://github.com/wevm/viem/commit/9cbd0820533c278bb4e40ff390a7091a607152b3) Thanks [@jxom](https://github.com/jxom)! - Added \`nonceKeyManager\` as a property to \`toSmartAccount\`.
16
+
17
+ - [#2638](https://github.com/wevm/viem/pull/2638) [`9cbd082`](https://github.com/wevm/viem/commit/9cbd0820533c278bb4e40ff390a7091a607152b3) Thanks [@jxom](https://github.com/jxom)! - Added ability to pass full-formed User Operations to `sendUserOperation` and `estimateUserOperationGas`.
18
+
19
+ - [#2639](https://github.com/wevm/viem/pull/2639) [`9a1c6ab`](https://github.com/wevm/viem/commit/9a1c6abe6c89c444c8fc28cea1fc6ef9759ae53b) Thanks [@jxom](https://github.com/jxom)! - **OP Stack:** Tweaked proof submitter logic.
20
+
21
+ ## 2.19.9
22
+
23
+ ### Patch Changes
24
+
25
+ - [#2598](https://github.com/wevm/viem/pull/2598) [`627274b`](https://github.com/wevm/viem/commit/627274b0cf70906d6d521f53e3290a87bcaee2b3) Thanks [@jxom](https://github.com/jxom)! - Added ZKsync `toSmartAccount`.
26
+
27
+ - [#2636](https://github.com/wevm/viem/pull/2636) [`5f60093`](https://github.com/wevm/viem/commit/5f6009360eaa41caf7318deb832dae7484190b5b) Thanks [@saeta-eth](https://github.com/saeta-eth)! - Added support for `'evm_setAccountCode'` to `setCode` action.
28
+
3
29
  ## 2.19.8
4
30
 
5
31
  ### Patch Changes
@@ -8,17 +8,16 @@ const getAction_js_1 = require("../../utils/getAction.js");
8
8
  const nonceManager_js_1 = require("../../utils/nonceManager.js");
9
9
  const serializeErc6492Signature_js_1 = require("../../utils/signature/serializeErc6492Signature.js");
10
10
  async function toSmartAccount(implementation) {
11
- const { extend, ...rest } = implementation;
12
- let deployed = false;
13
- const address = await implementation.getAddress();
14
- const nonceKeyManager = (0, nonceManager_js_1.createNonceManager)({
11
+ const { extend, nonceKeyManager = (0, nonceManager_js_1.createNonceManager)({
15
12
  source: {
16
13
  get() {
17
14
  return Date.now();
18
15
  },
19
16
  set() { },
20
17
  },
21
- });
18
+ }), ...rest } = implementation;
19
+ let deployed = false;
20
+ const address = await implementation.getAddress();
22
21
  return {
23
22
  ...extend,
24
23
  ...rest,
@@ -1 +1 @@
1
- {"version":3,"file":"toSmartAccount.js","sourceRoot":"","sources":["../../../account-abstraction/accounts/toSmartAccount.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"toSmartAccount.js","sourceRoot":"","sources":["../../../account-abstraction/accounts/toSmartAccount.ts"],"names":[],"mappings":"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"}
@@ -9,28 +9,31 @@ const userOperationGas_js_1 = require("../../utils/formatters/userOperationGas.j
9
9
  const userOperationRequest_js_1 = require("../../utils/formatters/userOperationRequest.js");
10
10
  const prepareUserOperation_js_1 = require("./prepareUserOperation.js");
11
11
  async function estimateUserOperationGas(client, parameters) {
12
- const { account: account_ = client.account } = parameters;
13
- if (!account_)
12
+ const { account: account_ = client.account, entryPointAddress } = parameters;
13
+ if (!account_ && !parameters.sender)
14
14
  throw new account_js_1.AccountNotFoundError();
15
- const account = (0, parseAccount_js_1.parseAccount)(account_);
16
- const request = await (0, getAction_js_1.getAction)(client, prepareUserOperation_js_1.prepareUserOperation, 'prepareUserOperation')({
17
- ...parameters,
18
- parameters: ['factory', 'nonce', 'paymaster', 'signature'],
19
- });
15
+ const account = account_ ? (0, parseAccount_js_1.parseAccount)(account_) : undefined;
16
+ const request = account
17
+ ? await (0, getAction_js_1.getAction)(client, prepareUserOperation_js_1.prepareUserOperation, 'prepareUserOperation')({
18
+ ...parameters,
19
+ parameters: ['factory', 'nonce', 'paymaster', 'signature'],
20
+ })
21
+ : parameters;
20
22
  try {
21
23
  const result = await client.request({
22
24
  method: 'eth_estimateUserOperationGas',
23
25
  params: [
24
26
  (0, userOperationRequest_js_1.formatUserOperationRequest)(request),
25
- account.entryPoint.address,
27
+ (entryPointAddress ?? account?.entryPoint?.address),
26
28
  ],
27
29
  });
28
30
  return (0, userOperationGas_js_1.formatUserOperationGas)(result);
29
31
  }
30
32
  catch (error) {
33
+ const calls = parameters.calls;
31
34
  throw (0, getUserOperationError_js_1.getUserOperationError)(error, {
32
35
  ...request,
33
- calls: parameters.calls,
36
+ ...(calls ? { calls } : {}),
34
37
  });
35
38
  }
36
39
  }
@@ -1 +1 @@
1
- {"version":3,"file":"estimateUserOperationGas.js","sourceRoot":"","sources":["../../../../account-abstraction/actions/bundler/estimateUserOperationGas.ts"],"names":[],"mappings":";;AA6HA,4DA4CC;AAxKD,6EAGgD;AAGhD,2DAAiE;AAOjE,8DAAuD;AAiBvD,0FAAmF;AACnF,oFAGmD;AACnD,4FAGuD;AACvD,uEAIkC;AAiF3B,KAAK,UAAU,wBAAwB,CAK5C,MAAqD,EACrD,UAIC;IAED,MAAM,EAAE,OAAO,EAAE,QAAQ,GAAG,MAAM,CAAC,OAAO,EAAE,GAAG,UAAU,CAAA;IAEzD,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,iCAAoB,EAAE,CAAA;IAC/C,MAAM,OAAO,GAAG,IAAA,8BAAY,EAAC,QAAQ,CAAC,CAAA;IAEtC,MAAM,OAAO,GAAG,MAAM,IAAA,wBAAS,EAC7B,MAAM,EACN,8CAAoB,EACpB,sBAAsB,CACvB,CAAC;QACA,GAAG,UAAU;QACb,UAAU,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,CAAC;KACd,CAAC,CAAA;IAE/C,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;YAClC,MAAM,EAAE,8BAA8B;YACtC,MAAM,EAAE;gBACN,IAAA,oDAA0B,EAAC,OAAwB,CAAC;gBACpD,OAAO,CAAC,UAAU,CAAC,OAAO;aAC3B;SACF,CAAC,CAAA;QACF,OAAO,IAAA,4CAAsB,EAAC,MAAM,CAGnC,CAAA;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAA,gDAAqB,EAAC,KAAkB,EAAE;YAC9C,GAAI,OAAyB;YAC7B,KAAK,EAAE,UAAU,CAAC,KAAK;SACxB,CAAC,CAAA;IACJ,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"estimateUserOperationGas.js","sourceRoot":"","sources":["../../../../account-abstraction/actions/bundler/estimateUserOperationGas.ts"],"names":[],"mappings":";;AA+IA,4DA+CC;AA7LD,6EAGgD;AAGhD,2DAAiE;AAYjE,8DAAuD;AAiBvD,0FAAmF;AACnF,oFAGmD;AACnD,4FAGuD;AACvD,uEAIkC;AA8F3B,KAAK,UAAU,wBAAwB,CAK5C,MAAqD,EACrD,UAIC;IAED,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,iCAAoB,EAAE,CAAA;IACrE,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAA,8BAAY,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAE7D,MAAM,OAAO,GAAG,OAAO;QACrB,CAAC,CAAC,MAAM,IAAA,wBAAS,EACb,MAAM,EACN,8CAAoB,EACpB,sBAAsB,CACvB,CAAC;YACA,GAAG,UAAU;YACb,UAAU,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,CAAC;SACd,CAAC;QACjD,CAAC,CAAC,UAAU,CAAA;IAEd,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;YAClC,MAAM,EAAE,8BAA8B;YACtC,MAAM,EAAE;gBACN,IAAA,oDAA0B,EAAC,OAAwB,CAAC;gBACpD,CAAC,iBAAiB,IAAI,OAAO,EAAE,UAAU,EAAE,OAAO,CAAE;aACrD;SACF,CAAC,CAAA;QACF,OAAO,IAAA,4CAAsB,EAAC,MAAM,CAGnC,CAAA;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,KAAK,GAAI,UAAkB,CAAC,KAAK,CAAA;QACvC,MAAM,IAAA,gDAAqB,EAAC,KAAkB,EAAE;YAC9C,GAAI,OAAyB;YAC7B,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC5B,CAAC,CAAA;IACJ,CAAC;AACH,CAAC"}
@@ -8,13 +8,15 @@ const getUserOperationError_js_1 = require("../../utils/errors/getUserOperationE
8
8
  const userOperationRequest_js_1 = require("../../utils/formatters/userOperationRequest.js");
9
9
  const prepareUserOperation_js_1 = require("./prepareUserOperation.js");
10
10
  async function sendUserOperation(client, parameters) {
11
- const { account: account_ = client.account } = parameters;
12
- if (!account_)
11
+ const { account: account_ = client.account, entryPointAddress } = parameters;
12
+ if (!account_ && !parameters.sender)
13
13
  throw new account_js_1.AccountNotFoundError();
14
- const account = (0, parseAccount_js_1.parseAccount)(account_);
15
- const request = await (0, getAction_js_1.getAction)(client, prepareUserOperation_js_1.prepareUserOperation, 'prepareUserOperation')(parameters);
16
- const signature = parameters.signature ||
17
- (await account.signUserOperation(request));
14
+ const account = account_ ? (0, parseAccount_js_1.parseAccount)(account_) : undefined;
15
+ const request = account
16
+ ? await (0, getAction_js_1.getAction)(client, prepareUserOperation_js_1.prepareUserOperation, 'prepareUserOperation')(parameters)
17
+ : parameters;
18
+ const signature = (parameters.signature ||
19
+ (await account?.signUserOperation(request)));
18
20
  const rpcParameters = (0, userOperationRequest_js_1.formatUserOperationRequest)({
19
21
  ...request,
20
22
  signature,
@@ -22,13 +24,17 @@ async function sendUserOperation(client, parameters) {
22
24
  try {
23
25
  return await client.request({
24
26
  method: 'eth_sendUserOperation',
25
- params: [rpcParameters, account.entryPoint.address],
27
+ params: [
28
+ rpcParameters,
29
+ (entryPointAddress ?? account?.entryPoint.address),
30
+ ],
26
31
  }, { retryCount: 0 });
27
32
  }
28
33
  catch (error) {
34
+ const calls = parameters.calls;
29
35
  throw (0, getUserOperationError_js_1.getUserOperationError)(error, {
30
36
  ...request,
31
- calls: parameters.calls,
37
+ ...(calls ? { calls } : {}),
32
38
  signature,
33
39
  });
34
40
  }
@@ -1 +1 @@
1
- {"version":3,"file":"sendUserOperation.js","sourceRoot":"","sources":["../../../../account-abstraction/actions/bundler/sendUserOperation.ts"],"names":[],"mappings":";;AAyGA,8CA2CC;AAnJD,6EAAsE;AAGtE,2DAAiE;AAOjE,8DAAuD;AAgBvD,0FAAmF;AACnF,4FAGuD;AACvD,uEAIkC;AAqE3B,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,iCAAoB,EAAE,CAAA;IAC/C,MAAM,OAAO,GAAG,IAAA,8BAAY,EAAC,QAAQ,CAAC,CAAA;IAEtC,MAAM,OAAO,GAAG,MAAM,IAAA,wBAAS,EAC7B,MAAM,EACN,8CAAoB,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,IAAA,oDAA0B,EAAC;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,IAAA,gDAAqB,EAAC,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":";;AAqHA,8CAgDC;AApKD,6EAAsE;AAGtE,2DAAiE;AAOjE,8DAAuD;AAgBvD,0FAAmF;AACnF,4FAGuD;AACvD,uEAIkC;AAiF3B,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,iCAAoB,EAAE,CAAA;IACrE,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAA,8BAAY,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAE7D,MAAM,OAAO,GAAG,OAAO;QACrB,CAAC,CAAC,MAAM,IAAA,wBAAS,EACb,MAAM,EACN,8CAAoB,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,IAAA,oDAA0B,EAAC;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,IAAA,gDAAqB,EAAC,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":";;AA4CA,kDAiCC;AA7ED,uDAAmD;AAGnD,yDAAuE;AAIvE,iDAAmE;AAEnE,yEAGsC;AACtC,6CAA0D;AAC1D,uEAA6E;AAC7E,2DAA+E;AAC/E,mEAGmC;AACnC,+DAGiC;AAqBjC,SAAgB,mBAAmB,CACjC,UAAe,EACf,UAAsC,EAAE;IAExC,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAA;IAChC,MAAM,SAAS,GAAG,IAAA,gBAAK,EAAC,qBAAS,CAAC,YAAY,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAA;IAC3E,MAAM,OAAO,GAAG,IAAA,0CAAkB,EAAC,SAAS,CAAC,CAAA;IAE7C,MAAM,OAAO,GAAG,IAAA,wBAAS,EAAC;QACxB,OAAO;QACP,YAAY;QACZ,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE;YACjB,OAAO,IAAA,cAAI,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;QAC9C,CAAC;QACD,KAAK,CAAC,8BAA8B,CAAC,aAAa;YAChD,OAAO,IAAA,qDAA8B,EAAC,EAAE,GAAG,aAAa,EAAE,UAAU,EAAE,CAAC,CAAA;QACzE,CAAC;QACD,KAAK,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE;YAC3B,OAAO,IAAA,4BAAW,EAAC,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,CAAA;QAC7C,CAAC;QACD,KAAK,CAAC,eAAe,CAAC,WAAW,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE;YACpD,OAAO,IAAA,oCAAe,EAAC,EAAE,UAAU,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,CAAA;QACjE,CAAC;QACD,KAAK,CAAC,aAAa,CAAC,SAAS;YAC3B,OAAO,IAAA,gCAAa,EAAC,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":";;AA4CA,kDAiCC;AA7ED,uDAAmD;AAGnD,yDAAuE;AAIvE,iDAAmE;AAEnE,yEAGsC;AACtC,6CAA0D;AAC1D,uEAA6E;AAC7E,2DAA+E;AAC/E,mEAGmC;AACnC,+DAGiC;AAqBjC,SAAgB,mBAAmB,CACjC,UAAe,EACf,UAAsC,EAAE;IAExC,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAA;IAChC,MAAM,SAAS,GAAG,IAAA,gBAAK,EAAC,qBAAS,CAAC,YAAY,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAA;IAC3E,MAAM,OAAO,GAAG,IAAA,0CAAkB,EAAC,SAAS,CAAC,CAAA;IAE7C,MAAM,OAAO,GAAG,IAAA,wBAAS,EAAC;QACxB,OAAO;QACP,YAAY;QACZ,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE;YACjB,OAAO,IAAA,cAAI,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;QAC9C,CAAC;QACD,KAAK,CAAC,8BAA8B,CAAC,aAAa;YAChD,OAAO,IAAA,qDAA8B,EAAC,EAAE,GAAG,aAAa,EAAE,UAAU,EAAE,CAAC,CAAA;QACzE,CAAC;QACD,KAAK,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE;YAC3B,OAAO,IAAA,4BAAW,EAAC,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,CAAA;QAC7C,CAAC;QACD,KAAK,CAAC,eAAe,CAAC,WAAW,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE;YACpD,OAAO,IAAA,oCAAe,EAAC,EAAE,UAAU,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,CAAA;QACjE,CAAC;QACD,KAAK,CAAC,aAAa,CAAC,SAAS;YAC3B,OAAO,IAAA,gCAAa,EAAC,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"}
@@ -2,9 +2,15 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.setCode = setCode;
4
4
  async function setCode(client, { address, bytecode }) {
5
- await client.request({
6
- method: `${client.mode}_setCode`,
7
- params: [address, bytecode],
8
- });
5
+ if (client.mode === 'ganache')
6
+ await client.request({
7
+ method: 'evm_setAccountCode',
8
+ params: [address, bytecode],
9
+ });
10
+ else
11
+ await client.request({
12
+ method: `${client.mode}_setCode`,
13
+ params: [address, bytecode],
14
+ });
9
15
  }
10
16
  //# sourceMappingURL=setCode.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"setCode.js","sourceRoot":"","sources":["../../../actions/test/setCode.ts"],"names":[],"mappings":";;AA6CA,0BAWC;AAXM,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":";;AA6CA,0BAiBC;AAjBM,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,5 +1,5 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.version = void 0;
4
- exports.version = '2.19.8';
4
+ exports.version = '2.20.0';
5
5
  //# sourceMappingURL=version.js.map
@@ -4,26 +4,41 @@ exports.sendCalls = sendCalls;
4
4
  const parseAccount_js_1 = require("../../../accounts/utils/parseAccount.js");
5
5
  const account_js_1 = require("../../../errors/account.js");
6
6
  const chain_js_1 = require("../../../errors/chain.js");
7
+ const encodeFunctionData_js_1 = require("../../../utils/abi/encodeFunctionData.js");
7
8
  const toHex_js_1 = require("../../../utils/encoding/toHex.js");
8
9
  const getTransactionError_js_1 = require("../../../utils/errors/getTransactionError.js");
9
10
  async function sendCalls(client, parameters) {
10
- const { account: account_ = client.account, calls, capabilities, chain = client.chain, version = '1.0', } = parameters;
11
+ const { account: account_ = client.account, capabilities, chain = client.chain, version = '1.0', } = parameters;
11
12
  if (!account_)
12
13
  throw new account_js_1.AccountNotFoundError({
13
14
  docsPath: '/experimental/eip5792/sendCalls',
14
15
  });
15
16
  const account = (0, parseAccount_js_1.parseAccount)(account_);
16
- if (!chain)
17
- throw new chain_js_1.ChainNotFoundError();
17
+ const calls = parameters.calls.map((call_) => {
18
+ const call = call_;
19
+ const chainId = call.chain?.id ?? call.chainId ?? chain?.id;
20
+ if (!chainId)
21
+ throw new chain_js_1.ChainNotFoundError();
22
+ const data = call.abi
23
+ ? (0, encodeFunctionData_js_1.encodeFunctionData)({
24
+ abi: call.abi,
25
+ functionName: call.functionName,
26
+ args: call.args,
27
+ })
28
+ : call.data;
29
+ return {
30
+ chainId: (0, toHex_js_1.numberToHex)(chainId),
31
+ data,
32
+ to: call.to,
33
+ value: call.value ? (0, toHex_js_1.numberToHex)(call.value) : undefined,
34
+ };
35
+ });
18
36
  try {
19
37
  return await client.request({
20
38
  method: 'wallet_sendCalls',
21
39
  params: [
22
40
  {
23
- calls: calls.map((call) => ({
24
- ...call,
25
- value: call.value ? (0, toHex_js_1.numberToHex)(call.value) : undefined,
26
- })),
41
+ calls,
27
42
  capabilities,
28
43
  chainId: (0, toHex_js_1.numberToHex)(chain.id),
29
44
  from: account.address,
@@ -1 +1 @@
1
- {"version":3,"file":"sendCalls.js","sourceRoot":"","sources":["../../../../experimental/eip5792/actions/sendCalls.ts"],"names":[],"mappings":";;AA6EA,8BAkDC;AA/HD,6EAAsE;AAGtE,2DAAiE;AAEjE,uDAA6D;AAW7D,+DAA8D;AAC9D,yFAAkF;AA4D3E,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,iCAAoB,CAAC;YAC7B,QAAQ,EAAE,iCAAiC;SAC5C,CAAC,CAAA;IACJ,MAAM,OAAO,GAAG,IAAA,8BAAY,EAAC,QAAQ,CAAC,CAAA;IAEtC,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,6BAAkB,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,IAAA,sBAAW,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;qBACxD,CAAC,CAAQ;oBACV,YAAY;oBACZ,OAAO,EAAE,IAAA,sBAAW,EAAC,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,IAAA,4CAAmB,EAAC,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":";;AA2EA,8BAmEC;AA7ID,6EAAsE;AAGtE,2DAAiE;AAEjE,uDAA6D;AAY7D,oFAA6E;AAE7E,+DAA8D;AAC9D,yFAAkF;AAsD3E,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,iCAAoB,CAAC;YAC7B,QAAQ,EAAE,iCAAiC;SAC5C,CAAC,CAAA;IACJ,MAAM,OAAO,GAAG,IAAA,8BAAY,EAAC,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,6BAAkB,EAAE,CAAA;QAE5C,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG;YACnB,CAAC,CAAC,IAAA,0CAAkB,EAAC;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,IAAA,sBAAW,EAAC,OAAO,CAAC;YAC7B,IAAI;YACJ,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAA,sBAAW,EAAC,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,IAAA,sBAAW,EAAC,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,IAAA,4CAAmB,EAAC,GAAgB,EAAE;YAC1C,GAAG,UAAU;YACb,OAAO;YACP,KAAK,EAAE,UAAU,CAAC,KAAM;SACzB,CAAC,CAAA;IACJ,CAAC;AACH,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"writeContracts.js","sourceRoot":"","sources":["../../../../experimental/eip5792/actions/writeContracts.ts"],"names":[],"mappings":";;AA8FA,wCAgCC;AA/GD,oFAGiD;AACjD,8DAAuD;AACvD,iDAKuB;AAqEhB,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,IAAA,0CAAkB,EAAC;gBACvB,GAAG;gBACH,YAAY;gBACZ,IAAI;aACL,CAAC;YACF,EAAE,EAAE,OAAO;YACX,KAAK;SACyC,CAAA;IAClD,CAAC,CAAC,CAAA;IACF,OAAO,IAAA,wBAAS,EACd,MAAM,EACN,wBAAS,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":";;AAgGA,wCAgCC;AAjHD,oFAGiD;AACjD,8DAAuD;AACvD,iDAKuB;AAuEhB,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,IAAA,0CAAkB,EAAC;gBACvB,GAAG;gBACH,YAAY;gBACZ,IAAI;aACL,CAAC;YACF,EAAE,EAAE,OAAO;YACX,KAAK;SACyC,CAAA;IAClD,CAAC,CAAC,CAAA;IACF,OAAO,IAAA,wBAAS,EACd,MAAM,EACN,wBAAS,EACT,WAAW,CACZ,CAAC,EAAE,GAAG,UAAU,EAAE,KAAK,EAAyB,CAAC,CAAA;AACpD,CAAC"}
@@ -47,11 +47,17 @@ async function getTimeToFinalize(client, parameters) {
47
47
  const timestamp = Date.now() + seconds * 1000;
48
48
  return { period: Number(period), seconds, timestamp };
49
49
  }
50
+ const numProofSubmitters = await (0, readContract_js_1.readContract)(client, {
51
+ abi: abis_js_1.portal2Abi,
52
+ address: portalAddress,
53
+ functionName: 'numProofSubmitters',
54
+ args: [withdrawalHash],
55
+ }).catch(() => 1n);
50
56
  const proofSubmitter = await (0, readContract_js_1.readContract)(client, {
51
57
  abi: abis_js_1.portal2Abi,
52
58
  address: portalAddress,
53
59
  functionName: 'proofSubmitters',
54
- args: [withdrawalHash, 0n],
60
+ args: [withdrawalHash, numProofSubmitters - 1n],
55
61
  }).catch(() => undefined);
56
62
  const [[_disputeGameProxy, proveTimestamp], proofMaturityDelaySeconds] = await Promise.all([
57
63
  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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"}
@@ -72,11 +72,17 @@ async function getWithdrawalStatus(client, parameters) {
72
72
  const { seconds } = timeToFinalizeResult.value;
73
73
  return seconds > 0 ? 'waiting-to-finalize' : 'ready-to-finalize';
74
74
  }
75
+ const numProofSubmitters = await (0, readContract_js_1.readContract)(client, {
76
+ abi: abis_js_1.portal2Abi,
77
+ address: portalAddress,
78
+ functionName: 'numProofSubmitters',
79
+ args: [withdrawal.withdrawalHash],
80
+ }).catch(() => 1n);
75
81
  const proofSubmitter = await (0, readContract_js_1.readContract)(client, {
76
82
  abi: abis_js_1.portal2Abi,
77
83
  address: portalAddress,
78
84
  functionName: 'proofSubmitters',
79
- args: [withdrawal.withdrawalHash, 0n],
85
+ args: [withdrawal.withdrawalHash, numProofSubmitters - 1n],
80
86
  }).catch(() => withdrawal.sender);
81
87
  const [disputeGameResult, checkWithdrawalResult, finalizedResult] = await Promise.allSettled([
82
88
  (0, getGame_js_1.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,16 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.toMultisigSmartAccount = toMultisigSmartAccount;
4
+ const sign_js_1 = require("../../accounts/utils/sign.js");
5
+ const index_js_1 = require("../../utils/index.js");
6
+ const toSmartAccount_js_1 = require("./toSmartAccount.js");
7
+ function toMultisigSmartAccount(parameters) {
8
+ const { address, privateKeys } = parameters;
9
+ return (0, toSmartAccount_js_1.toSmartAccount)({
10
+ address,
11
+ async sign({ hash }) {
12
+ return (0, index_js_1.concatHex)(await Promise.all(privateKeys.map((privateKey) => (0, sign_js_1.sign)({ hash, privateKey, to: 'hex' }))));
13
+ },
14
+ });
15
+ }
16
+ //# sourceMappingURL=toMultisigSmartAccount.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"toMultisigSmartAccount.js","sourceRoot":"","sources":["../../../zksync/accounts/toMultisigSmartAccount.ts"],"names":[],"mappings":";;AAmBA,wDAiBC;AAlCD,0DAAmD;AAEnD,mDAAgD;AAEhD,2DAAoD;AAapD,SAAgB,sBAAsB,CACpC,UAA4C;IAE5C,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,UAAU,CAAA;IAE3C,OAAO,IAAA,kCAAc,EAAC;QACpB,OAAO;QACP,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE;YACjB,OAAO,IAAA,oBAAS,EACd,MAAM,OAAO,CAAC,GAAG,CACf,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAC7B,IAAA,cAAI,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CACtC,CACF,CACF,CAAA;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC"}
@@ -0,0 +1,15 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.toSinglesigSmartAccount = toSinglesigSmartAccount;
4
+ const sign_js_1 = require("../../accounts/utils/sign.js");
5
+ const toSmartAccount_js_1 = require("./toSmartAccount.js");
6
+ function toSinglesigSmartAccount(parameters) {
7
+ const { address, privateKey } = parameters;
8
+ return (0, toSmartAccount_js_1.toSmartAccount)({
9
+ address,
10
+ async sign({ hash }) {
11
+ return (0, sign_js_1.sign)({ hash, privateKey, to: 'hex' });
12
+ },
13
+ });
14
+ }
15
+ //# sourceMappingURL=toSinglesigSmartAccount.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"toSinglesigSmartAccount.js","sourceRoot":"","sources":["../../../zksync/accounts/toSinglesigSmartAccount.ts"],"names":[],"mappings":";;AAkBA,0DAWC;AA3BD,0DAAmD;AAGnD,2DAAoD;AAapD,SAAgB,uBAAuB,CACrC,UAA6C;IAE7C,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,UAAU,CAAA;IAE1C,OAAO,IAAA,kCAAc,EAAC;QACpB,OAAO;QACP,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE;YACjB,OAAO,IAAA,cAAI,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;QAC9C,CAAC;KACF,CAAC,CAAA;AACJ,CAAC"}
@@ -0,0 +1,42 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.toSmartAccount = toSmartAccount;
4
+ const toAccount_js_1 = require("../../accounts/toAccount.js");
5
+ const index_js_1 = require("../../utils/index.js");
6
+ const hashMessage_js_1 = require("../../utils/signature/hashMessage.js");
7
+ const hashTypedData_js_1 = require("../../utils/signature/hashTypedData.js");
8
+ const serializers_js_1 = require("../serializers.js");
9
+ function toSmartAccount(parameters) {
10
+ const { address, sign } = parameters;
11
+ const account = (0, toAccount_js_1.toAccount)({
12
+ address,
13
+ sign,
14
+ async signMessage({ message }) {
15
+ return sign({
16
+ hash: (0, hashMessage_js_1.hashMessage)(message),
17
+ });
18
+ },
19
+ async signTransaction(transaction) {
20
+ const signableTransaction = {
21
+ ...transaction,
22
+ from: this.address,
23
+ };
24
+ return (0, serializers_js_1.serializeTransaction)({
25
+ ...signableTransaction,
26
+ customSignature: await sign({
27
+ hash: (0, index_js_1.keccak256)((0, serializers_js_1.serializeTransaction)(signableTransaction)),
28
+ }),
29
+ });
30
+ },
31
+ async signTypedData(typedData) {
32
+ return sign({
33
+ hash: (0, hashTypedData_js_1.hashTypedData)(typedData),
34
+ });
35
+ },
36
+ });
37
+ return {
38
+ ...account,
39
+ source: 'smartAccountZksync',
40
+ };
41
+ }
42
+ //# sourceMappingURL=toSmartAccount.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"toSmartAccount.js","sourceRoot":"","sources":["../../../zksync/accounts/toSmartAccount.ts"],"names":[],"mappings":";;AAyBA,wCAqCC;AA5DD,8DAAuD;AAGvD,mDAAgD;AAChD,yEAAkE;AAClE,6EAAsE;AACtE,sDAAwD;AAiBxD,SAAgB,cAAc,CAC5B,UAAoC;IAEpC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,UAAU,CAAA;IAEpC,MAAM,OAAO,GAAG,IAAA,wBAAS,EAAC;QACxB,OAAO;QACP,IAAI;QACJ,KAAK,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE;YAC3B,OAAO,IAAI,CAAC;gBACV,IAAI,EAAE,IAAA,4BAAW,EAAC,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,IAAA,qCAAoB,EAAC;gBAC1B,GAAG,mBAAmB;gBACtB,eAAe,EAAE,MAAM,IAAI,CAAC;oBAC1B,IAAI,EAAE,IAAA,oBAAS,EAAC,IAAA,qCAAoB,EAAC,mBAAmB,CAAC,CAAC;iBAC3D,CAAC;aACH,CAAC,CAAA;QACJ,CAAC;QACD,KAAK,CAAC,aAAa,CAAC,SAAS;YAC3B,OAAO,IAAI,CAAC;gBACV,IAAI,EAAE,IAAA,gCAAa,EAAC,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,6 +1,12 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getGeneralPaymasterInput = exports.getApprovalBasedPaymasterInput = exports.serializeTransaction = exports.publicActionsL2 = exports.publicActionsL1 = exports.eip712WalletActions = exports.chainConfig = exports.zksyncSepoliaTestnet = exports.zkSyncSepoliaTestnet = exports.zksyncLocalNode = exports.zkSyncLocalNode = exports.zksyncInMemoryNode = exports.zkSyncInMemoryNode = exports.zksync = exports.zkSync = exports.signTransaction = exports.signEip712Transaction = exports.sendEip712Transaction = exports.sendTransaction = exports.getTransactionDetails = exports.getTestnetPaymasterAddress = exports.getRawBlockTransactions = exports.getMainContractAddress = exports.getLogProof = exports.getL1TokenBalance = exports.getL1ChainId = exports.getL1BatchNumber = exports.getL1BatchDetails = exports.getL1BatchBlockRange = exports.getL1Balance = exports.getL1Allowance = exports.getBridgehubContractAddress = exports.getDefaultBridgeAddresses = exports.getBlockDetails = exports.getAllBalances = exports.estimateFee = exports.deployContract = void 0;
3
+ exports.getGeneralPaymasterInput = exports.getApprovalBasedPaymasterInput = exports.serializeTransaction = exports.publicActionsL2 = exports.publicActionsL1 = exports.eip712WalletActions = exports.chainConfig = exports.zksyncSepoliaTestnet = exports.zkSyncSepoliaTestnet = exports.zksyncLocalNode = exports.zkSyncLocalNode = exports.zksyncInMemoryNode = exports.zkSyncInMemoryNode = exports.zksync = exports.zkSync = exports.signTransaction = exports.signEip712Transaction = exports.sendEip712Transaction = exports.sendTransaction = exports.getTransactionDetails = exports.getTestnetPaymasterAddress = exports.getRawBlockTransactions = exports.getMainContractAddress = exports.getLogProof = exports.getL1TokenBalance = exports.getL1ChainId = exports.getL1BatchNumber = exports.getL1BatchDetails = exports.getL1BatchBlockRange = exports.getL1Balance = exports.getL1Allowance = exports.getBridgehubContractAddress = exports.getDefaultBridgeAddresses = exports.getBlockDetails = exports.getAllBalances = exports.estimateFee = exports.deployContract = exports.toSinglesigSmartAccount = exports.toMultisigSmartAccount = exports.toSmartAccount = void 0;
4
+ var toSmartAccount_js_1 = require("./accounts/toSmartAccount.js");
5
+ Object.defineProperty(exports, "toSmartAccount", { enumerable: true, get: function () { return toSmartAccount_js_1.toSmartAccount; } });
6
+ var toMultisigSmartAccount_js_1 = require("./accounts/toMultisigSmartAccount.js");
7
+ Object.defineProperty(exports, "toMultisigSmartAccount", { enumerable: true, get: function () { return toMultisigSmartAccount_js_1.toMultisigSmartAccount; } });
8
+ var toSinglesigSmartAccount_js_1 = require("./accounts/toSinglesigSmartAccount.js");
9
+ Object.defineProperty(exports, "toSinglesigSmartAccount", { enumerable: true, get: function () { return toSinglesigSmartAccount_js_1.toSinglesigSmartAccount; } });
4
10
  var deployContract_js_1 = require("./actions/deployContract.js");
5
11
  Object.defineProperty(exports, "deployContract", { enumerable: true, get: function () { return deployContract_js_1.deployContract; } });
6
12
  var estimateFee_js_1 = require("./actions/estimateFee.js");
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../zksync/index.ts"],"names":[],"mappings":";;;AACA,iEAKoC;AADlC,mHAAA,cAAc,OAAA;AAEhB,2DAIiC;AAD/B,6GAAA,WAAW,OAAA;AAEb,iEAIoC;AADlC,mHAAA,cAAc,OAAA;AAEhB,mEAIqC;AADnC,qHAAA,eAAe,OAAA;AAEjB,uFAG+C;AAD7C,yIAAA,yBAAyB,OAAA;AAE3B,2FAAsF;AAA7E,6IAAA,2BAA2B,OAAA;AACpC,iEAKoC;AADlC,mHAAA,cAAc,OAAA;AAEhB,6DAKkC;AADhC,+GAAA,YAAY,OAAA;AAEd,6EAI0C;AADxC,+HAAA,oBAAoB,OAAA;AAEtB,uEAIuC;AADrC,yHAAA,iBAAiB,OAAA;AAEnB,qEAAgE;AAAvD,uHAAA,gBAAgB,OAAA;AACzB,6DAAwD;AAA/C,+GAAA,YAAY,OAAA;AACrB,uEAKuC;AADrC,yHAAA,iBAAiB,OAAA;AAEnB,2DAIiC;AAD/B,6GAAA,WAAW,OAAA;AAEb,iFAA4E;AAAnE,mIAAA,sBAAsB,OAAA;AAC/B,mFAI6C;AAD3C,qIAAA,uBAAuB,OAAA;AAEzB,yFAAoF;AAA3E,2IAAA,0BAA0B,OAAA;AACnC,+EAI2C;AADzC,iIAAA,qBAAqB,OAAA;AAEvB,mEAKqC;AADnC,qHAAA,eAAe,OAAA;AAEjB,+EAK2C;AADzC,iIAAA,qBAAqB,OAAA;AAEvB,+EAK2C;AADzC,iIAAA,qBAAqB,OAAA;AAEvB,mEAKqC;AADnC,qHAAA,eAAe,OAAA;AAGjB,yCAaoB;AAXlB,mGAAA,MAAM,OAAU;AAChB,mGAAA,MAAM,OAAA;AAEN,+GAAA,kBAAkB,OAAsB;AACxC,+GAAA,kBAAkB,OAAA;AAElB,4GAAA,eAAe,OAAmB;AAClC,4GAAA,eAAe,OAAA;AAEf,iHAAA,oBAAoB,OAAwB;AAC5C,iHAAA,oBAAoB,OAAA;AAGtB,mDAA8C;AAArC,6GAAA,WAAW,OAAA;AAEpB,oDAG+B;AAF7B,gHAAA,mBAAmB,OAAA;AAIrB,wDAGiC;AAF/B,8GAAA,eAAe,OAAA;AAIjB,wDAGiC;AAF/B,8GAAA,eAAe,OAAA;AAIjB,mDAAuD;AAA9C,sHAAA,oBAAoB,OAAA;AAsH7B,yGAI4D;AAD1D,mJAAA,8BAA8B,OAAA;AAEhC,6FAIsD;AADpD,uIAAA,wBAAwB,OAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../zksync/index.ts"],"names":[],"mappings":";;;AACA,kEAIqC;AADnC,mHAAA,cAAc,OAAA;AAEhB,kFAG6C;AAD3C,mIAAA,sBAAsB,OAAA;AAExB,oFAG8C;AAD5C,qIAAA,uBAAuB,OAAA;AAGzB,iEAKoC;AADlC,mHAAA,cAAc,OAAA;AAEhB,2DAIiC;AAD/B,6GAAA,WAAW,OAAA;AAEb,iEAIoC;AADlC,mHAAA,cAAc,OAAA;AAEhB,mEAIqC;AADnC,qHAAA,eAAe,OAAA;AAEjB,uFAG+C;AAD7C,yIAAA,yBAAyB,OAAA;AAE3B,2FAAsF;AAA7E,6IAAA,2BAA2B,OAAA;AACpC,iEAKoC;AADlC,mHAAA,cAAc,OAAA;AAEhB,6DAKkC;AADhC,+GAAA,YAAY,OAAA;AAEd,6EAI0C;AADxC,+HAAA,oBAAoB,OAAA;AAEtB,uEAIuC;AADrC,yHAAA,iBAAiB,OAAA;AAEnB,qEAAgE;AAAvD,uHAAA,gBAAgB,OAAA;AACzB,6DAAwD;AAA/C,+GAAA,YAAY,OAAA;AACrB,uEAKuC;AADrC,yHAAA,iBAAiB,OAAA;AAEnB,2DAIiC;AAD/B,6GAAA,WAAW,OAAA;AAEb,iFAA4E;AAAnE,mIAAA,sBAAsB,OAAA;AAC/B,mFAI6C;AAD3C,qIAAA,uBAAuB,OAAA;AAEzB,yFAAoF;AAA3E,2IAAA,0BAA0B,OAAA;AACnC,+EAI2C;AADzC,iIAAA,qBAAqB,OAAA;AAEvB,mEAKqC;AADnC,qHAAA,eAAe,OAAA;AAEjB,+EAK2C;AADzC,iIAAA,qBAAqB,OAAA;AAEvB,+EAK2C;AADzC,iIAAA,qBAAqB,OAAA;AAEvB,mEAKqC;AADnC,qHAAA,eAAe,OAAA;AAGjB,yCAaoB;AAXlB,mGAAA,MAAM,OAAU;AAChB,mGAAA,MAAM,OAAA;AAEN,+GAAA,kBAAkB,OAAsB;AACxC,+GAAA,kBAAkB,OAAA;AAElB,4GAAA,eAAe,OAAmB;AAClC,4GAAA,eAAe,OAAA;AAEf,iHAAA,oBAAoB,OAAwB;AAC5C,iHAAA,oBAAoB,OAAA;AAGtB,mDAA8C;AAArC,6GAAA,WAAW,OAAA;AAEpB,oDAG+B;AAF7B,gHAAA,mBAAmB,OAAA;AAIrB,wDAGiC;AAF/B,8GAAA,eAAe,OAAA;AAIjB,wDAGiC;AAF/B,8GAAA,eAAe,OAAA;AAIjB,mDAAuD;AAA9C,sHAAA,oBAAoB,OAAA;AAuH7B,yGAI4D;AAD1D,mJAAA,8BAA8B,OAAA;AAEhC,6FAIsD;AADpD,uIAAA,wBAAwB,OAAA"}
@@ -0,0 +1,3 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ //# sourceMappingURL=account.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"account.js","sourceRoot":"","sources":["../../../zksync/types/account.ts"],"names":[],"mappings":""}
@@ -11,17 +11,16 @@ import { serializeErc6492Signature } from '../../utils/signature/serializeErc649
11
11
  * @returns A Smart Account. {@link ToSmartAccountReturnType}
12
12
  */
13
13
  export async function toSmartAccount(implementation) {
14
- const { extend, ...rest } = implementation;
15
- let deployed = false;
16
- const address = await implementation.getAddress();
17
- const nonceKeyManager = createNonceManager({
14
+ const { extend, nonceKeyManager = createNonceManager({
18
15
  source: {
19
16
  get() {
20
17
  return Date.now();
21
18
  },
22
19
  set() { },
23
20
  },
24
- });
21
+ }), ...rest } = implementation;
22
+ let deployed = false;
23
+ const address = await implementation.getAddress();
25
24
  return {
26
25
  ...extend,
27
26
  ...rest,
@@ -1 +1 @@
1
- {"version":3,"file":"toSmartAccount.js","sourceRoot":"","sources":["../../../account-abstraction/accounts/toSmartAccount.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"toSmartAccount.js","sourceRoot":"","sources":["../../../account-abstraction/accounts/toSmartAccount.ts"],"names":[],"mappings":"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"}
@@ -33,28 +33,31 @@ import { prepareUserOperation, } from './prepareUserOperation.js';
33
33
  * })
34
34
  */
35
35
  export async function estimateUserOperationGas(client, parameters) {
36
- const { account: account_ = client.account } = parameters;
37
- if (!account_)
36
+ const { account: account_ = client.account, entryPointAddress } = parameters;
37
+ if (!account_ && !parameters.sender)
38
38
  throw new AccountNotFoundError();
39
- const account = parseAccount(account_);
40
- const request = await getAction(client, prepareUserOperation, 'prepareUserOperation')({
41
- ...parameters,
42
- parameters: ['factory', 'nonce', 'paymaster', 'signature'],
43
- });
39
+ const account = account_ ? parseAccount(account_) : undefined;
40
+ const request = account
41
+ ? await getAction(client, prepareUserOperation, 'prepareUserOperation')({
42
+ ...parameters,
43
+ parameters: ['factory', 'nonce', 'paymaster', 'signature'],
44
+ })
45
+ : parameters;
44
46
  try {
45
47
  const result = await client.request({
46
48
  method: 'eth_estimateUserOperationGas',
47
49
  params: [
48
50
  formatUserOperationRequest(request),
49
- account.entryPoint.address,
51
+ (entryPointAddress ?? account?.entryPoint?.address),
50
52
  ],
51
53
  });
52
54
  return formatUserOperationGas(result);
53
55
  }
54
56
  catch (error) {
57
+ const calls = parameters.calls;
55
58
  throw getUserOperationError(error, {
56
59
  ...request,
57
- calls: parameters.calls,
60
+ ...(calls ? { calls } : {}),
58
61
  });
59
62
  }
60
63
  }
@@ -1 +1 @@
1
- {"version":3,"file":"estimateUserOperationGas.js","sourceRoot":"","sources":["../../../../account-abstraction/actions/bundler/estimateUserOperationGas.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,YAAY,GACb,MAAM,yCAAyC,CAAA;AAGhD,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAA;AAOjE,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AAiBvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAA;AACnF,OAAO,EAEL,sBAAsB,GACvB,MAAM,4CAA4C,CAAA;AACnD,OAAO,EAEL,0BAA0B,GAC3B,MAAM,gDAAgD,CAAA;AACvD,OAAO,EAGL,oBAAoB,GACrB,MAAM,2BAA2B,CAAA;AAsDlC;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAK5C,MAAqD,EACrD,UAIC;IAED,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;QACA,GAAG,UAAU;QACb,UAAU,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,CAAC;KACd,CAAC,CAAA;IAE/C,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;YAClC,MAAM,EAAE,8BAA8B;YACtC,MAAM,EAAE;gBACN,0BAA0B,CAAC,OAAwB,CAAC;gBACpD,OAAO,CAAC,UAAU,CAAC,OAAO;aAC3B;SACF,CAAC,CAAA;QACF,OAAO,sBAAsB,CAAC,MAAM,CAGnC,CAAA;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,qBAAqB,CAAC,KAAkB,EAAE;YAC9C,GAAI,OAAyB;YAC7B,KAAK,EAAE,UAAU,CAAC,KAAK;SACxB,CAAC,CAAA;IACJ,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"estimateUserOperationGas.js","sourceRoot":"","sources":["../../../../account-abstraction/actions/bundler/estimateUserOperationGas.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,YAAY,GACb,MAAM,yCAAyC,CAAA;AAGhD,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAA;AAYjE,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AAiBvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAA;AACnF,OAAO,EAEL,sBAAsB,GACvB,MAAM,4CAA4C,CAAA;AACnD,OAAO,EAEL,0BAA0B,GAC3B,MAAM,gDAAgD,CAAA;AACvD,OAAO,EAGL,oBAAoB,GACrB,MAAM,2BAA2B,CAAA;AAmElC;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAK5C,MAAqD,EACrD,UAIC;IAED,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;YACA,GAAG,UAAU;YACb,UAAU,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,CAAC;SACd,CAAC;QACjD,CAAC,CAAC,UAAU,CAAA;IAEd,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;YAClC,MAAM,EAAE,8BAA8B;YACtC,MAAM,EAAE;gBACN,0BAA0B,CAAC,OAAwB,CAAC;gBACpD,CAAC,iBAAiB,IAAI,OAAO,EAAE,UAAU,EAAE,OAAO,CAAE;aACrD;SACF,CAAC,CAAA;QACF,OAAO,sBAAsB,CAAC,MAAM,CAGnC,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;SAC5B,CAAC,CAAA;IACJ,CAAC;AACH,CAAC"}