@matterlabs/zksync-js 0.0.22 → 0.0.24

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (50) hide show
  1. package/dist/adapters/ethers/client.cjs +0 -7
  2. package/dist/adapters/ethers/client.cjs.map +1 -1
  3. package/dist/adapters/ethers/client.js +5 -5
  4. package/dist/adapters/ethers/index.cjs +202 -93
  5. package/dist/adapters/ethers/index.cjs.map +1 -1
  6. package/dist/adapters/ethers/index.js +9 -9
  7. package/dist/adapters/ethers/resources/deposits/context.d.ts +2 -0
  8. package/dist/adapters/ethers/resources/deposits/services/gas.d.ts +3 -0
  9. package/dist/adapters/ethers/sdk.cjs +202 -105
  10. package/dist/adapters/ethers/sdk.cjs.map +1 -1
  11. package/dist/adapters/ethers/sdk.js +8 -8
  12. package/dist/adapters/viem/client.cjs +0 -7
  13. package/dist/adapters/viem/client.cjs.map +1 -1
  14. package/dist/adapters/viem/client.js +5 -5
  15. package/dist/adapters/viem/index.cjs +194 -92
  16. package/dist/adapters/viem/index.cjs.map +1 -1
  17. package/dist/adapters/viem/index.js +9 -9
  18. package/dist/adapters/viem/resources/deposits/context.d.ts +2 -0
  19. package/dist/adapters/viem/resources/deposits/services/gas.d.ts +3 -0
  20. package/dist/adapters/viem/sdk.cjs +194 -108
  21. package/dist/adapters/viem/sdk.cjs.map +1 -1
  22. package/dist/adapters/viem/sdk.js +8 -8
  23. package/dist/{chunk-NQRYXL3K.js → chunk-3IPSDGHO.js} +17 -1
  24. package/dist/{chunk-KL6ZCPWJ.js → chunk-4ZANKNIK.js} +1 -1
  25. package/dist/{chunk-3SPDWWRD.js → chunk-5S63J6DW.js} +60 -32
  26. package/dist/{chunk-CP4SQ5PM.js → chunk-B6P24GL5.js} +137 -57
  27. package/dist/{chunk-QUAPG3ZR.js → chunk-BQ2YCWV2.js} +2 -2
  28. package/dist/{chunk-2D3FBCZC.js → chunk-H5A6GU3D.js} +2 -2
  29. package/dist/{chunk-AMRHBZIY.js → chunk-JNS4XZE2.js} +2 -9
  30. package/dist/{chunk-32N6TI6K.js → chunk-OEUDZFXH.js} +1 -1
  31. package/dist/{chunk-PI4PF6WT.js → chunk-PNTR5FTL.js} +3 -3
  32. package/dist/{chunk-4K4LOCQJ.js → chunk-QMMFUWRV.js} +129 -56
  33. package/dist/{chunk-CPNHKNI4.js → chunk-RZH7HBH3.js} +2 -2
  34. package/dist/{chunk-JXBLQQEN.js → chunk-YEA74D2L.js} +3 -3
  35. package/dist/{chunk-CUBUD4J4.js → chunk-YGXEIOK6.js} +1 -1
  36. package/dist/core/adapters/interfaces.d.ts +2 -0
  37. package/dist/core/constants.cjs +16 -0
  38. package/dist/core/constants.cjs.map +1 -1
  39. package/dist/core/constants.d.ts +8 -0
  40. package/dist/core/constants.js +1 -1
  41. package/dist/core/index.cjs +0 -7
  42. package/dist/core/index.cjs.map +1 -1
  43. package/dist/core/index.js +5 -5
  44. package/dist/core/internal/abis/IL2AssetRouter.d.ts +0 -14
  45. package/dist/core/resources/deposits/priority.d.ts +30 -0
  46. package/dist/core/types/errors.d.ts +1 -1
  47. package/dist/index.cjs +16 -7
  48. package/dist/index.cjs.map +1 -1
  49. package/dist/index.js +4 -4
  50. package/package.json +1 -1
@@ -1,8 +1,8 @@
1
- export { createViemSdk } from '../../chunk-4K4LOCQJ.js';
2
- import '../../chunk-3SPDWWRD.js';
3
- import '../../chunk-QUAPG3ZR.js';
4
- import '../../chunk-32N6TI6K.js';
5
- import '../../chunk-2D3FBCZC.js';
6
- import '../../chunk-KL6ZCPWJ.js';
7
- import '../../chunk-AMRHBZIY.js';
8
- import '../../chunk-NQRYXL3K.js';
1
+ export { createViemSdk } from '../../chunk-QMMFUWRV.js';
2
+ import '../../chunk-5S63J6DW.js';
3
+ import '../../chunk-BQ2YCWV2.js';
4
+ import '../../chunk-OEUDZFXH.js';
5
+ import '../../chunk-H5A6GU3D.js';
6
+ import '../../chunk-4ZANKNIK.js';
7
+ import '../../chunk-JNS4XZE2.js';
8
+ import '../../chunk-3IPSDGHO.js';
@@ -20,12 +20,16 @@ __export(constants_exports, {
20
20
  L1_FEE_ESTIMATION_COEF_NUMERATOR: () => L1_FEE_ESTIMATION_COEF_NUMERATOR,
21
21
  L1_MESSENGER_ADDRESS: () => L1_MESSENGER_ADDRESS,
22
22
  L1_SOPH_TOKEN_ADDRESS: () => L1_SOPH_TOKEN_ADDRESS,
23
+ L1_TX_CALLDATA_FLOOR_PRICE_L2_GAS_ZKSYNC_OS: () => L1_TX_CALLDATA_FLOOR_PRICE_L2_GAS_ZKSYNC_OS,
23
24
  L1_TX_DELTA_544_ENCODING_BYTES: () => L1_TX_DELTA_544_ENCODING_BYTES,
24
25
  L1_TX_DELTA_FACTORY_DEPS_L2_GAS: () => L1_TX_DELTA_FACTORY_DEPS_L2_GAS,
25
26
  L1_TX_DELTA_FACTORY_DEPS_PUBDATA: () => L1_TX_DELTA_FACTORY_DEPS_PUBDATA,
26
27
  L1_TX_INTRINSIC_L2_GAS: () => L1_TX_INTRINSIC_L2_GAS,
28
+ L1_TX_INTRINSIC_L2_GAS_ZKSYNC_OS: () => L1_TX_INTRINSIC_L2_GAS_ZKSYNC_OS,
27
29
  L1_TX_INTRINSIC_PUBDATA: () => L1_TX_INTRINSIC_PUBDATA,
30
+ L1_TX_INTRINSIC_PUBDATA_ZKSYNC_OS: () => L1_TX_INTRINSIC_PUBDATA_ZKSYNC_OS,
28
31
  L1_TX_MIN_L2_GAS_BASE: () => L1_TX_MIN_L2_GAS_BASE,
32
+ L1_TX_NATIVE_PER_GAS: () => L1_TX_NATIVE_PER_GAS,
29
33
  L2_ASSET_ROUTER_ADDRESS: () => L2_ASSET_ROUTER_ADDRESS,
30
34
  L2_BASE_TOKEN_ADDRESS: () => L2_BASE_TOKEN_ADDRESS,
31
35
  L2_INTEROP_ATTRIBUTE_PARSER_ADDRESS: () => L2_INTEROP_ATTRIBUTE_PARSER_ADDRESS,
@@ -34,7 +38,10 @@ __export(constants_exports, {
34
38
  L2_INTEROP_ROOT_STORAGE_ADDRESS: () => L2_INTEROP_ROOT_STORAGE_ADDRESS,
35
39
  L2_MESSAGE_VERIFICATION_ADDRESS: () => L2_MESSAGE_VERIFICATION_ADDRESS,
36
40
  L2_NATIVE_TOKEN_VAULT_ADDRESS: () => L2_NATIVE_TOKEN_VAULT_ADDRESS,
41
+ MAX_NATIVE_COMPUTATIONAL_ZKSYNC_OS: () => MAX_NATIVE_COMPUTATIONAL_ZKSYNC_OS,
37
42
  PRIORITY_TX_MAX_GAS_LIMIT: () => PRIORITY_TX_MAX_GAS_LIMIT,
43
+ REGISTERED_TOKEN_BRIDGE_MINT_EXECUTION_GAS: () => REGISTERED_TOKEN_BRIDGE_MINT_EXECUTION_GAS,
44
+ REGISTERED_TOKEN_BRIDGE_MINT_PUBDATA_BYTES: () => REGISTERED_TOKEN_BRIDGE_MINT_PUBDATA_BYTES,
38
45
  SAFE_L1_BRIDGE_GAS: () => SAFE_L1_BRIDGE_GAS,
39
46
  TOPIC_CANONICAL_ASSIGNED: () => TOPIC_CANONICAL_ASSIGNED,
40
47
  TOPIC_CANONICAL_SUCCESS: () => TOPIC_CANONICAL_SUCCESS,
@@ -44,6 +51,7 @@ __export(constants_exports, {
44
51
  TX_MEMORY_OVERHEAD_GAS: () => TX_MEMORY_OVERHEAD_GAS,
45
52
  TX_OVERHEAD_GAS: () => TX_OVERHEAD_GAS,
46
53
  TX_SLOT_OVERHEAD_L2_GAS: () => TX_SLOT_OVERHEAD_L2_GAS,
54
+ ZKSYNC_OS_PRIORITY_TX_TYPE: () => ZKSYNC_OS_PRIORITY_TX_TYPE,
47
55
  k256hex: () => k256hex
48
56
  });
49
57
  var k256hex = (s) => `0x${bytesToHex(keccak_256(utf8ToBytes(s)))}`.toLowerCase();
@@ -79,7 +87,15 @@ var L1_TX_DELTA_FACTORY_DEPS_L2_GAS = 2473n;
79
87
  var L1_TX_DELTA_FACTORY_DEPS_PUBDATA = 64n;
80
88
  var TX_SLOT_OVERHEAD_L2_GAS = 10000n;
81
89
  var PRIORITY_TX_MAX_GAS_LIMIT = 72000000n;
90
+ var L1_TX_INTRINSIC_L2_GAS_ZKSYNC_OS = 21000n;
91
+ var L1_TX_CALLDATA_FLOOR_PRICE_L2_GAS_ZKSYNC_OS = 40n;
92
+ var L1_TX_INTRINSIC_PUBDATA_ZKSYNC_OS = 351n;
93
+ var MAX_NATIVE_COMPUTATIONAL_ZKSYNC_OS = 1n << 35n;
94
+ var L1_TX_NATIVE_PER_GAS = 100000000n;
95
+ var ZKSYNC_OS_PRIORITY_TX_TYPE = "0x7f";
96
+ var REGISTERED_TOKEN_BRIDGE_MINT_EXECUTION_GAS = 140000n;
97
+ var REGISTERED_TOKEN_BRIDGE_MINT_PUBDATA_BYTES = 300n;
82
98
  var L1_FEE_ESTIMATION_COEF_NUMERATOR = 12;
83
99
  var L1_FEE_ESTIMATION_COEF_DENOMINATOR = 10;
84
100
 
85
- export { BUFFER, BUNDLE_IDENTIFIER, DEFAULT_ABI_BYTES, DEFAULT_PUBDATA_BYTES, ETH_ADDRESS, FORMAL_ETH_ADDRESS, L1_FEE_ESTIMATION_COEF_DENOMINATOR, L1_FEE_ESTIMATION_COEF_NUMERATOR, L1_MESSENGER_ADDRESS, L1_SOPH_TOKEN_ADDRESS, L1_TX_DELTA_544_ENCODING_BYTES, L1_TX_DELTA_FACTORY_DEPS_L2_GAS, L1_TX_DELTA_FACTORY_DEPS_PUBDATA, L1_TX_INTRINSIC_L2_GAS, L1_TX_INTRINSIC_PUBDATA, L1_TX_MIN_L2_GAS_BASE, L2_ASSET_ROUTER_ADDRESS, L2_BASE_TOKEN_ADDRESS, L2_INTEROP_ATTRIBUTE_PARSER_ADDRESS, L2_INTEROP_CENTER_ADDRESS, L2_INTEROP_HANDLER_ADDRESS, L2_INTEROP_ROOT_STORAGE_ADDRESS, L2_MESSAGE_VERIFICATION_ADDRESS, L2_NATIVE_TOKEN_VAULT_ADDRESS, PRIORITY_TX_MAX_GAS_LIMIT, SAFE_L1_BRIDGE_GAS, TOPIC_CANONICAL_ASSIGNED, TOPIC_CANONICAL_SUCCESS, TOPIC_L1_MESSAGE_SENT, TOPIC_L1_MESSAGE_SENT_LEG, TOPIC_L1_MESSAGE_SENT_NEW, TX_MEMORY_OVERHEAD_GAS, TX_OVERHEAD_GAS, TX_SLOT_OVERHEAD_L2_GAS, __export, constants_exports, k256hex };
101
+ export { BUFFER, BUNDLE_IDENTIFIER, DEFAULT_ABI_BYTES, DEFAULT_PUBDATA_BYTES, ETH_ADDRESS, FORMAL_ETH_ADDRESS, L1_FEE_ESTIMATION_COEF_DENOMINATOR, L1_FEE_ESTIMATION_COEF_NUMERATOR, L1_MESSENGER_ADDRESS, L1_SOPH_TOKEN_ADDRESS, L1_TX_CALLDATA_FLOOR_PRICE_L2_GAS_ZKSYNC_OS, L1_TX_DELTA_544_ENCODING_BYTES, L1_TX_DELTA_FACTORY_DEPS_L2_GAS, L1_TX_DELTA_FACTORY_DEPS_PUBDATA, L1_TX_INTRINSIC_L2_GAS, L1_TX_INTRINSIC_L2_GAS_ZKSYNC_OS, L1_TX_INTRINSIC_PUBDATA, L1_TX_INTRINSIC_PUBDATA_ZKSYNC_OS, L1_TX_MIN_L2_GAS_BASE, L1_TX_NATIVE_PER_GAS, L2_ASSET_ROUTER_ADDRESS, L2_BASE_TOKEN_ADDRESS, L2_INTEROP_ATTRIBUTE_PARSER_ADDRESS, L2_INTEROP_CENTER_ADDRESS, L2_INTEROP_HANDLER_ADDRESS, L2_INTEROP_ROOT_STORAGE_ADDRESS, L2_MESSAGE_VERIFICATION_ADDRESS, L2_NATIVE_TOKEN_VAULT_ADDRESS, MAX_NATIVE_COMPUTATIONAL_ZKSYNC_OS, PRIORITY_TX_MAX_GAS_LIMIT, REGISTERED_TOKEN_BRIDGE_MINT_EXECUTION_GAS, REGISTERED_TOKEN_BRIDGE_MINT_PUBDATA_BYTES, SAFE_L1_BRIDGE_GAS, TOPIC_CANONICAL_ASSIGNED, TOPIC_CANONICAL_SUCCESS, TOPIC_L1_MESSAGE_SENT, TOPIC_L1_MESSAGE_SENT_LEG, TOPIC_L1_MESSAGE_SENT_NEW, TX_MEMORY_OVERHEAD_GAS, TX_OVERHEAD_GAS, TX_SLOT_OVERHEAD_L2_GAS, ZKSYNC_OS_PRIORITY_TX_TYPE, __export, constants_exports, k256hex };
@@ -1,4 +1,4 @@
1
- import { isZKsyncError, createError, shapeCause } from './chunk-AMRHBZIY.js';
1
+ import { isZKsyncError, createError, shapeCause } from './chunk-JNS4XZE2.js';
2
2
 
3
3
  // src/core/errors/error-ops.ts
4
4
  function resolveMessage(op, msg) {
@@ -1,6 +1,6 @@
1
- import { isL1MessageSentLog } from './chunk-32N6TI6K.js';
2
- import { IBridgehub_default, isHash66, isBigint, isHash, assertNever, createError, OP_INTEROP, isNumber, isAddress, isHash66Array } from './chunk-AMRHBZIY.js';
3
- import { BUFFER, DEFAULT_ABI_BYTES, DEFAULT_PUBDATA_BYTES, TX_MEMORY_OVERHEAD_GAS, TX_OVERHEAD_GAS, L1_TX_MIN_L2_GAS_BASE, L1_TX_INTRINSIC_L2_GAS, L1_TX_DELTA_544_ENCODING_BYTES, L1_TX_DELTA_FACTORY_DEPS_L2_GAS, L1_TX_INTRINSIC_PUBDATA, L1_TX_DELTA_FACTORY_DEPS_PUBDATA, TX_SLOT_OVERHEAD_L2_GAS, PRIORITY_TX_MAX_GAS_LIMIT, L2_INTEROP_CENTER_ADDRESS, BUNDLE_IDENTIFIER } from './chunk-NQRYXL3K.js';
1
+ import { isL1MessageSentLog } from './chunk-OEUDZFXH.js';
2
+ import { IBridgehub_default, isHash66, isBigint, isHash, assertNever, createError, OP_INTEROP, isNumber, isAddress, isHash66Array } from './chunk-JNS4XZE2.js';
3
+ import { BUFFER, DEFAULT_ABI_BYTES, DEFAULT_PUBDATA_BYTES, TX_MEMORY_OVERHEAD_GAS, TX_OVERHEAD_GAS, L1_TX_MIN_L2_GAS_BASE, L1_TX_INTRINSIC_L2_GAS, L1_TX_DELTA_544_ENCODING_BYTES, L1_TX_DELTA_FACTORY_DEPS_L2_GAS, L1_TX_INTRINSIC_PUBDATA, L1_TX_DELTA_FACTORY_DEPS_PUBDATA, TX_SLOT_OVERHEAD_L2_GAS, PRIORITY_TX_MAX_GAS_LIMIT, REGISTERED_TOKEN_BRIDGE_MINT_EXECUTION_GAS, REGISTERED_TOKEN_BRIDGE_MINT_PUBDATA_BYTES, L2_INTEROP_CENTER_ADDRESS, BUNDLE_IDENTIFIER, L1_TX_INTRINSIC_PUBDATA_ZKSYNC_OS, L1_TX_NATIVE_PER_GAS, MAX_NATIVE_COMPUTATIONAL_ZKSYNC_OS, L1_TX_INTRINSIC_L2_GAS_ZKSYNC_OS, L1_TX_CALLDATA_FLOOR_PRICE_L2_GAS_ZKSYNC_OS } from './chunk-3IPSDGHO.js';
4
4
 
5
5
  // src/core/resources/deposits/chains.ts
6
6
  var ERAVM_CHAIN_IDS = /* @__PURE__ */ new Set([324n, 2741n, 11124n, 300n]);
@@ -207,40 +207,16 @@ function toGasOverrides(overrides) {
207
207
  return gas;
208
208
  }
209
209
 
210
- // src/core/resources/deposits/fee.ts
211
- function buildFeeBreakdown(p) {
212
- const l1MaxTotal = p.l1Gas?.maxCost ?? 0n;
213
- const l2Total = p.l2BaseCost + p.operatorTip;
214
- const l1 = {
215
- gasLimit: p.l1Gas?.gasLimit ?? 0n,
216
- maxFeePerGas: p.l1Gas?.maxFeePerGas ?? 0n,
217
- maxPriorityFeePerGas: p.l1Gas?.maxPriorityFeePerGas,
218
- maxTotal: l1MaxTotal
219
- };
220
- const l2 = {
221
- total: l2Total,
222
- baseCost: p.l2BaseCost,
223
- operatorTip: p.operatorTip,
224
- gasLimit: p.l2Gas?.gasLimit ?? 0n,
225
- maxFeePerGas: p.l2Gas?.maxFeePerGas ?? 0n,
226
- maxPriorityFeePerGas: p.l2Gas?.maxPriorityFeePerGas,
227
- gasPerPubdata: p.l2Gas?.gasPerPubdata ?? 0n
228
- };
229
- return {
230
- token: p.feeToken,
231
- maxTotal: l1MaxTotal + l2Total,
232
- mintValue: p.mintValue,
233
- l1,
234
- l2
235
- };
236
- }
237
-
238
210
  // src/core/resources/deposits/priority.ts
239
211
  var PRIORITY_TX_ENCODING_STEP_BYTES = 544n;
212
+ var L1_TO_L2_ALIAS_OFFSET = 0x1111000000000000000000000000000000001111n;
240
213
  var DEFAULT_PRIORITY_BODY_GAS_ESTIMATE_MULTIPLIER = 7n;
241
214
  var PRIORITY_L2_GAS_BUFFER = 40n;
242
215
  var maxBigInt2 = (a, b) => a > b ? a : b;
243
216
  var ceilDiv = (a, b) => (a + b - 1n) / b;
217
+ function applyL1ToL2Alias(address) {
218
+ return `0x${(BigInt(address) + L1_TO_L2_ALIAS_OFFSET & (1n << 160n) - 1n).toString(16).padStart(40, "0")}`;
219
+ }
244
220
  function derivePriorityTxGasBreakdown(input) {
245
221
  const factoryDepsCount = input.factoryDepsCount ?? 0n;
246
222
  const minBodyGas = maxBigInt2(
@@ -268,6 +244,58 @@ function derivePriorityBodyGasEstimateCap(input) {
268
244
  function applyPriorityL2GasLimitBuffer(input) {
269
245
  return input.gasLimit * (100n + PRIORITY_L2_GAS_BUFFER) / 100n;
270
246
  }
247
+ function minimalPriorityTxL2Gas(input) {
248
+ const intrinsic = L1_TX_INTRINSIC_L2_GAS_ZKSYNC_OS + L1_TX_CALLDATA_FLOOR_PRICE_L2_GAS_ZKSYNC_OS * input.calldataLength;
249
+ const pubdata = L1_TX_INTRINSIC_PUBDATA_ZKSYNC_OS * input.gasPerPubdata + ceilDiv(MAX_NATIVE_COMPUTATIONAL_ZKSYNC_OS, L1_TX_NATIVE_PER_GAS);
250
+ return maxBigInt2(intrinsic, pubdata);
251
+ }
252
+ function clampPriorityL2GasLimit(input) {
253
+ return maxBigInt2(
254
+ input.gasLimit,
255
+ minimalPriorityTxL2Gas({
256
+ calldataLength: BigInt(Math.max(input.l2Calldata.length - 2, 0) / 2),
257
+ gasPerPubdata: input.gasPerPubdata
258
+ })
259
+ );
260
+ }
261
+ function resolveRegisteredTokenPriorityL2GasLimit(input) {
262
+ if (input.nodeEstimate != null && input.nodeEstimate > 0n) {
263
+ return maxBigInt2(input.priorityFloorGasLimit, applyGasBuffer(input.nodeEstimate));
264
+ }
265
+ const modeledGas = REGISTERED_TOKEN_BRIDGE_MINT_EXECUTION_GAS + REGISTERED_TOKEN_BRIDGE_MINT_PUBDATA_BYTES * input.gasPerPubdata;
266
+ return maxBigInt2(
267
+ input.priorityFloorGasLimit,
268
+ applyPriorityL2GasLimitBuffer({ chainIdL2: input.chainIdL2, gasLimit: modeledGas })
269
+ );
270
+ }
271
+
272
+ // src/core/resources/deposits/fee.ts
273
+ function buildFeeBreakdown(p) {
274
+ const l1MaxTotal = p.l1Gas?.maxCost ?? 0n;
275
+ const l2Total = p.l2BaseCost + p.operatorTip;
276
+ const l1 = {
277
+ gasLimit: p.l1Gas?.gasLimit ?? 0n,
278
+ maxFeePerGas: p.l1Gas?.maxFeePerGas ?? 0n,
279
+ maxPriorityFeePerGas: p.l1Gas?.maxPriorityFeePerGas,
280
+ maxTotal: l1MaxTotal
281
+ };
282
+ const l2 = {
283
+ total: l2Total,
284
+ baseCost: p.l2BaseCost,
285
+ operatorTip: p.operatorTip,
286
+ gasLimit: p.l2Gas?.gasLimit ?? 0n,
287
+ maxFeePerGas: p.l2Gas?.maxFeePerGas ?? 0n,
288
+ maxPriorityFeePerGas: p.l2Gas?.maxPriorityFeePerGas,
289
+ gasPerPubdata: p.l2Gas?.gasPerPubdata ?? 0n
290
+ };
291
+ return {
292
+ token: p.feeToken,
293
+ maxTotal: l1MaxTotal + l2Total,
294
+ mintValue: p.mintValue,
295
+ l1,
296
+ l2
297
+ };
298
+ }
271
299
 
272
300
  // src/core/resources/interop/attributes/call.ts
273
301
  function createCallAttributes(codec) {
@@ -654,4 +682,4 @@ async function quoteL2Gas2(input) {
654
682
  }
655
683
  }
656
684
 
657
- export { DEFAULT_POLL_MS, DEFAULT_TIMEOUT_MS, ZERO_HASH, applyPriorityL2GasLimitBuffer, assertProtocolVersion, buildDirectBundle, buildFeeBreakdown, buildFinalizationInfo, buildIndirectBundle, createAttributesResource, createNTVCodec, derivePriorityBodyGasEstimateCap, derivePriorityTxGasBreakdown, isInteropFinalizationInfo, parseBundleReceiptInfo, parseBundleSentFromReceipt, pickInteropRoute, preflightDirect, preflightIndirect, quoteL1Gas, quoteL2BaseCost, quoteL2Gas, quoteL2Gas2, resolveCreateDepositL1GasLimit, resolveIdsFromWaitable, toGasOverrides };
685
+ export { DEFAULT_POLL_MS, DEFAULT_TIMEOUT_MS, ZERO_HASH, applyL1ToL2Alias, applyPriorityL2GasLimitBuffer, assertProtocolVersion, buildDirectBundle, buildFeeBreakdown, buildFinalizationInfo, buildIndirectBundle, clampPriorityL2GasLimit, createAttributesResource, createNTVCodec, derivePriorityBodyGasEstimateCap, derivePriorityTxGasBreakdown, isInteropFinalizationInfo, parseBundleReceiptInfo, parseBundleSentFromReceipt, pickInteropRoute, preflightDirect, preflightIndirect, quoteL1Gas, quoteL2BaseCost, quoteL2Gas, quoteL2Gas2, resolveCreateDepositL1GasLimit, resolveIdsFromWaitable, resolveRegisteredTokenPriorityL2GasLimit, toGasOverrides };
@@ -1,9 +1,9 @@
1
- import { createErrorHandlers, toZKsyncError, classifyReadinessFromRevert } from './chunk-CPNHKNI4.js';
2
- import { createNTVCodec, createAttributesResource, resolveCreateDepositL1GasLimit, isInteropFinalizationInfo, DEFAULT_POLL_MS, DEFAULT_TIMEOUT_MS, resolveIdsFromWaitable, parseBundleReceiptInfo, buildFinalizationInfo, parseBundleSentFromReceipt, pickInteropRoute, ZERO_HASH, toGasOverrides, applyPriorityL2GasLimitBuffer, buildFeeBreakdown, buildIndirectBundle, preflightIndirect, buildDirectBundle, preflightDirect, derivePriorityTxGasBreakdown, quoteL2Gas, quoteL2BaseCost, quoteL1Gas, derivePriorityBodyGasEstimateCap, assertProtocolVersion, quoteL2Gas2 } from './chunk-3SPDWWRD.js';
3
- import { detectWithdrawalProtocol, buildWithdrawalFinalization, parseBundleHashFromLogs, classifyWithdrawalOutcome, phaseFromReadiness, buildWithdrawalBundle } from './chunk-QUAPG3ZR.js';
4
- import { findL1MessageSentLog, messengerLogIndex, l1MessageSentSender, pickWithdrawRoute } from './chunk-32N6TI6K.js';
5
- import { IERC7786Attributes_default, isHash66, IL1Nullifier_default, IInteropHandler_default, createError, OP_WITHDRAWALS, normalizeL1Token, isAddressEq, hexEq, OP_DEPOSITS, IERC20_default, isZKsyncError, isReceiptNotFound, IL1NullifierV32_default, OP_INTEROP, IInteropRootStorage_default, IInteropCenter_default, sleep, isETH, normalizeAddrEq, IL2AssetRouter_default, L2NativeTokenVault_default, assertNever } from './chunk-AMRHBZIY.js';
6
- import { ETH_ADDRESS, TOPIC_CANONICAL_ASSIGNED, TOPIC_CANONICAL_SUCCESS, L2_BASE_TOKEN_ADDRESS, L2_NATIVE_TOKEN_VAULT_ADDRESS, L1_MESSENGER_ADDRESS, L2_INTEROP_ROOT_STORAGE_ADDRESS, BUFFER, SAFE_L1_BRIDGE_GAS, L2_ASSET_ROUTER_ADDRESS, FORMAL_ETH_ADDRESS } from './chunk-NQRYXL3K.js';
1
+ import { createErrorHandlers, toZKsyncError, classifyReadinessFromRevert } from './chunk-RZH7HBH3.js';
2
+ import { createNTVCodec, createAttributesResource, resolveCreateDepositL1GasLimit, isInteropFinalizationInfo, DEFAULT_POLL_MS, DEFAULT_TIMEOUT_MS, resolveIdsFromWaitable, parseBundleReceiptInfo, buildFinalizationInfo, parseBundleSentFromReceipt, pickInteropRoute, ZERO_HASH, toGasOverrides, clampPriorityL2GasLimit, applyPriorityL2GasLimitBuffer, buildFeeBreakdown, buildIndirectBundle, preflightIndirect, buildDirectBundle, preflightDirect, derivePriorityTxGasBreakdown, quoteL2Gas, quoteL2BaseCost, quoteL1Gas, applyL1ToL2Alias, derivePriorityBodyGasEstimateCap, assertProtocolVersion, resolveRegisteredTokenPriorityL2GasLimit, quoteL2Gas2 } from './chunk-5S63J6DW.js';
3
+ import { detectWithdrawalProtocol, buildWithdrawalFinalization, parseBundleHashFromLogs, classifyWithdrawalOutcome, phaseFromReadiness, buildWithdrawalBundle } from './chunk-BQ2YCWV2.js';
4
+ import { findL1MessageSentLog, messengerLogIndex, l1MessageSentSender, pickWithdrawRoute } from './chunk-OEUDZFXH.js';
5
+ import { IERC7786Attributes_default, isHash66, IL1Nullifier_default, IInteropHandler_default, createError, OP_WITHDRAWALS, normalizeL1Token, isAddressEq, hexEq, OP_DEPOSITS, IERC20_default, isZKsyncError, isReceiptNotFound, IL1NullifierV32_default, OP_INTEROP, IInteropRootStorage_default, IInteropCenter_default, sleep, isETH, normalizeAddrEq, IL2AssetRouter_default, L2NativeTokenVault_default, assertNever } from './chunk-JNS4XZE2.js';
6
+ import { ETH_ADDRESS, TOPIC_CANONICAL_ASSIGNED, TOPIC_CANONICAL_SUCCESS, L2_BASE_TOKEN_ADDRESS, L2_NATIVE_TOKEN_VAULT_ADDRESS, L1_MESSENGER_ADDRESS, L2_INTEROP_ROOT_STORAGE_ADDRESS, BUFFER, SAFE_L1_BRIDGE_GAS, L2_ASSET_ROUTER_ADDRESS, FORMAL_ETH_ADDRESS, ZKSYNC_OS_PRIORITY_TX_TYPE } from './chunk-3IPSDGHO.js';
7
7
  import { Interface, keccak256, AbiCoder, ethers, getBytes, Contract, NonceManager, JsonRpcProvider, getAddress, concat, hexlify, toBeArray, toBeHex, isError } from 'ethers';
8
8
 
9
9
  var I_BRIDGEHUB = new Interface([
@@ -72,7 +72,7 @@ async function waitForL2ExecutionFromL1Tx(l1, l2, l1TxHash) {
72
72
 
73
73
  // src/adapters/ethers/resources/deposits/context.ts
74
74
  async function commonCtx(p, client, tokens, contracts) {
75
- const { bridgehub, l1AssetRouter } = await contracts.addresses();
75
+ const { bridgehub, l1AssetRouter, l1NativeTokenVault } = await contracts.addresses();
76
76
  const { chainId } = await client.l2.getNetwork();
77
77
  const sender = await client.signer.getAddress();
78
78
  const gasPerPubdata = p.gasPerPubdata ?? 800n;
@@ -100,6 +100,7 @@ async function commonCtx(p, client, tokens, contracts) {
100
100
  baseTokenL1,
101
101
  baseIsEth,
102
102
  l1AssetRouter,
103
+ l1NativeTokenVault,
103
104
  route,
104
105
  bridgehub,
105
106
  chainIdL2: BigInt(chainId),
@@ -189,6 +190,15 @@ function ethersToGasEstimator(provider) {
189
190
  }
190
191
  return await provider.estimateGas(ethTx);
191
192
  },
193
+ async estimatePriorityTxGas(tx) {
194
+ if (!("send" in provider)) {
195
+ throw new Error('Provider does not support "send"; cannot estimate priority tx gas.');
196
+ }
197
+ const result = await provider.send("eth_estimateGas", [
198
+ { from: tx.from, to: tx.to, data: tx.data, type: ZKSYNC_OS_PRIORITY_TX_TYPE }
199
+ ]);
200
+ return BigInt(result);
201
+ },
192
202
  async estimateFeesPerGas() {
193
203
  const fd = await provider.getFeeData();
194
204
  return {
@@ -240,6 +250,14 @@ async function quoteL2BaseCost2(input) {
240
250
  // src/adapters/ethers/resources/deposits/services/gas.ts
241
251
  var DEFAULT_SAFE_NONBASE_L2_GAS_LIMIT = 3000000n;
242
252
  var ZERO_L2_TOKEN_ADDRESS = "0x0000000000000000000000000000000000000000";
253
+ async function estimatePriorityTxL2Gas(ctx, leg) {
254
+ if (!leg) return void 0;
255
+ try {
256
+ return await ethersToGasEstimator(ctx.client.l2).estimatePriorityTxGas?.(leg);
257
+ } catch {
258
+ return void 0;
259
+ }
260
+ }
243
261
  async function quoteL1Gas2(input) {
244
262
  const { ctx, tx, overrides, fallbackGasLimit } = input;
245
263
  const estimator = ethersToGasEstimator(ctx.client.l1);
@@ -293,7 +311,12 @@ async function determineNonBaseL2Gas(input) {
293
311
  return quoteL2Gas3({
294
312
  ctx,
295
313
  route,
296
- overrideGasLimit: input.priorityFloorGasLimit
314
+ overrideGasLimit: resolveRegisteredTokenPriorityL2GasLimit({
315
+ chainIdL2: ctx.chainIdL2,
316
+ priorityFloorGasLimit: input.priorityFloorGasLimit,
317
+ gasPerPubdata: ctx.gasPerPubdata,
318
+ nodeEstimate: await estimatePriorityTxL2Gas(ctx, input.priorityTxL2Leg)
319
+ })
297
320
  });
298
321
  }
299
322
  const modelTx = {
@@ -330,6 +353,7 @@ async function determineEthNonBaseL2Gas(input) {
330
353
  knownL2Token: input.ctx.resolvedToken?.l2,
331
354
  modelTx: input.modelTx,
332
355
  priorityFloorGasLimit: input.priorityFloorGasLimit,
356
+ priorityTxL2Leg: input.priorityTxL2Leg,
333
357
  undeployedGasLimit: input.undeployedGasLimit
334
358
  });
335
359
  }
@@ -389,9 +413,13 @@ function routeEthDirect() {
389
413
  l2Calldata,
390
414
  gasPerPubdata: ctx.gasPerPubdata
391
415
  });
392
- const quotedL2GasLimit = ctx.l2GasLimit ?? applyPriorityL2GasLimitBuffer({
393
- chainIdL2: ctx.chainIdL2,
394
- gasLimit: priorityFloorBreakdown.derivedL2GasLimit
416
+ const quotedL2GasLimit = ctx.l2GasLimit ?? clampPriorityL2GasLimit({
417
+ gasLimit: applyPriorityL2GasLimitBuffer({
418
+ chainIdL2: ctx.chainIdL2,
419
+ gasLimit: priorityFloorBreakdown.derivedL2GasLimit
420
+ }),
421
+ l2Calldata,
422
+ gasPerPubdata: ctx.gasPerPubdata
395
423
  });
396
424
  const l2GasParams = await quoteL2Gas3({
397
425
  ctx,
@@ -462,26 +490,18 @@ var ntvCodec = createNTVCodec({
462
490
  keccak256: (data) => keccak256(data)
463
491
  });
464
492
  async function encodeSecondBridgeErc20DepositCalldata(input) {
465
- if (!input.ctx.resolvedToken) {
466
- return encodeSecondBridgeErc20Args(input.token, input.amount, input.receiver);
467
- }
468
- const { chainId } = await input.ctx.client.l1.getNetwork();
469
- const expectedL1AssetId = ntvCodec.encodeAssetId(
470
- BigInt(chainId),
493
+ const registeredAssetId = input.ctx.resolvedToken?.assetId;
494
+ const assetId = registeredAssetId && registeredAssetId.toLowerCase() !== ZERO_ASSET_ID ? registeredAssetId : ntvCodec.encodeAssetId(
495
+ BigInt((await input.ctx.client.l1.getNetwork()).chainId),
471
496
  L2_NATIVE_TOKEN_VAULT_ADDRESS,
472
497
  input.token
473
498
  );
474
- const assetId = input.ctx.resolvedToken.assetId.toLowerCase();
475
- const isL1Origin = assetId === ZERO_ASSET_ID || assetId === expectedL1AssetId.toLowerCase();
476
- if (isL1Origin) {
477
- return encodeSecondBridgeErc20Args(input.token, input.amount, input.receiver);
478
- }
479
499
  const transferData = encodeNativeTokenVaultTransferData(
480
500
  input.amount,
481
501
  input.receiver,
482
502
  input.token
483
503
  );
484
- return encodeSecondBridgeDataV1(input.ctx.resolvedToken.assetId, transferData);
504
+ return encodeSecondBridgeDataV1(assetId, transferData);
485
505
  }
486
506
  async function getPriorityGasModel(input) {
487
507
  try {
@@ -516,9 +536,18 @@ async function getPriorityGasModel(input) {
516
536
  gasPerPubdata: input.ctx.gasPerPubdata
517
537
  });
518
538
  const model = {
519
- priorityFloorGasLimit: applyPriorityL2GasLimitBuffer({
520
- chainIdL2: input.ctx.chainIdL2,
521
- gasLimit: priorityFloorBreakdown.derivedL2GasLimit
539
+ priorityTxL2Leg: {
540
+ from: applyL1ToL2Alias(input.ctx.l1AssetRouter),
541
+ to: L2_ASSET_ROUTER_ADDRESS,
542
+ data: l2Calldata
543
+ },
544
+ priorityFloorGasLimit: clampPriorityL2GasLimit({
545
+ gasLimit: applyPriorityL2GasLimitBuffer({
546
+ chainIdL2: input.ctx.chainIdL2,
547
+ gasLimit: priorityFloorBreakdown.derivedL2GasLimit
548
+ }),
549
+ l2Calldata,
550
+ gasPerPubdata: input.ctx.gasPerPubdata
522
551
  })
523
552
  };
524
553
  if (isFirstBridge || input.ctx.resolvedToken.l2.toLowerCase() === ZERO_L2_TOKEN_ADDRESS2) {
@@ -576,6 +605,7 @@ function routeErc20NonBase() {
576
605
  ctx,
577
606
  l1Token: p.token,
578
607
  priorityFloorGasLimit: priorityGasModel.priorityFloorGasLimit,
608
+ priorityTxL2Leg: priorityGasModel.priorityTxL2Leg,
579
609
  undeployedGasLimit: priorityGasModel.undeployedGasLimit,
580
610
  modelTx: {
581
611
  to: receiver,
@@ -590,25 +620,29 @@ function routeErc20NonBase() {
590
620
  const approvals = [];
591
621
  const steps = [];
592
622
  const assetRouter = ctx.l1AssetRouter;
623
+ const nativeTokenVault = ctx.l1NativeTokenVault;
593
624
  const erc20Deposit = new Contract(p.token, IERC20_default, l1Signer);
594
625
  const allowanceToken = await wrapAs2(
595
626
  "RPC",
596
627
  OP_DEPOSITS.nonbase.allowanceToken,
597
- () => erc20Deposit.allowance(ctx.sender, assetRouter),
628
+ () => erc20Deposit.allowance(ctx.sender, nativeTokenVault),
598
629
  {
599
- ctx: { where: "erc20.allowance", token: p.token, spender: assetRouter },
630
+ ctx: { where: "erc20.allowance", token: p.token, spender: nativeTokenVault },
600
631
  message: "Failed to read deposit-token allowance."
601
632
  }
602
633
  );
603
634
  if (allowanceToken < p.amount) {
604
- approvals.push({ token: p.token, spender: assetRouter, amount: p.amount });
635
+ approvals.push({ token: p.token, spender: nativeTokenVault, amount: p.amount });
605
636
  steps.push({
606
- key: `approve:${p.token}:${assetRouter}`,
637
+ key: `approve:${p.token}:${nativeTokenVault}`,
607
638
  kind: "approve",
608
- description: `Approve ${p.amount} for router (deposit token)`,
639
+ description: `Approve ${p.amount} for the native token vault (deposit token)`,
609
640
  tx: {
610
641
  to: p.token,
611
- data: erc20Deposit.interface.encodeFunctionData("approve", [assetRouter, p.amount]),
642
+ data: erc20Deposit.interface.encodeFunctionData("approve", [
643
+ nativeTokenVault,
644
+ p.amount
645
+ ]),
612
646
  from: ctx.sender,
613
647
  ...ctx.gasOverrides
614
648
  }
@@ -619,21 +653,24 @@ function routeErc20NonBase() {
619
653
  const allowanceBase = await wrapAs2(
620
654
  "RPC",
621
655
  OP_DEPOSITS.nonbase.allowanceBase,
622
- () => erc20Base.allowance(ctx.sender, assetRouter),
656
+ () => erc20Base.allowance(ctx.sender, nativeTokenVault),
623
657
  {
624
- ctx: { where: "erc20.allowance", token: baseToken, spender: assetRouter },
658
+ ctx: { where: "erc20.allowance", token: baseToken, spender: nativeTokenVault },
625
659
  message: "Failed to read base-token allowance."
626
660
  }
627
661
  );
628
662
  if (allowanceBase < mintValue) {
629
- approvals.push({ token: baseToken, spender: assetRouter, amount: mintValue });
663
+ approvals.push({ token: baseToken, spender: nativeTokenVault, amount: mintValue });
630
664
  steps.push({
631
- key: `approve:${baseToken}:${assetRouter}`,
665
+ key: `approve:${baseToken}:${nativeTokenVault}`,
632
666
  kind: "approve",
633
667
  description: `Approve base token for mintValue`,
634
668
  tx: {
635
669
  to: baseToken,
636
- data: erc20Base.interface.encodeFunctionData("approve", [assetRouter, mintValue]),
670
+ data: erc20Base.interface.encodeFunctionData("approve", [
671
+ nativeTokenVault,
672
+ mintValue
673
+ ]),
637
674
  from: ctx.sender,
638
675
  ...ctx.gasOverrides
639
676
  }
@@ -703,6 +740,20 @@ var ntvCodec2 = createNTVCodec({
703
740
  encode: (types, values) => AbiCoder.defaultAbiCoder().encode(types, values),
704
741
  keccak256: (data) => keccak256(data)
705
742
  });
743
+ async function encodeSecondBridgeEthDepositCalldata(input) {
744
+ const registeredAssetId = input.ctx.resolvedToken?.assetId;
745
+ const assetId = registeredAssetId && registeredAssetId.toLowerCase() !== ZERO_ASSET_ID2 ? registeredAssetId : ntvCodec2.encodeAssetId(
746
+ BigInt((await input.ctx.client.l1.getNetwork()).chainId),
747
+ L2_NATIVE_TOKEN_VAULT_ADDRESS,
748
+ ETH_ADDRESS
749
+ );
750
+ const transferData = encodeNativeTokenVaultTransferData(
751
+ input.amount,
752
+ input.receiver,
753
+ ETH_ADDRESS
754
+ );
755
+ return encodeSecondBridgeDataV1(assetId, transferData);
756
+ }
706
757
  async function getPriorityGasModel2(input) {
707
758
  try {
708
759
  const l1AssetRouter = await input.ctx.contracts.l1AssetRouter();
@@ -730,9 +781,18 @@ async function getPriorityGasModel2(input) {
730
781
  gasPerPubdata: input.ctx.gasPerPubdata
731
782
  });
732
783
  const model = {
733
- priorityFloorGasLimit: applyPriorityL2GasLimitBuffer({
734
- chainIdL2: input.ctx.chainIdL2,
735
- gasLimit: priorityFloorBreakdown.derivedL2GasLimit
784
+ priorityTxL2Leg: {
785
+ from: applyL1ToL2Alias(input.ctx.l1AssetRouter),
786
+ to: L2_ASSET_ROUTER_ADDRESS,
787
+ data: l2Calldata
788
+ },
789
+ priorityFloorGasLimit: clampPriorityL2GasLimit({
790
+ gasLimit: applyPriorityL2GasLimitBuffer({
791
+ chainIdL2: input.ctx.chainIdL2,
792
+ gasLimit: priorityFloorBreakdown.derivedL2GasLimit
793
+ }),
794
+ l2Calldata,
795
+ gasPerPubdata: input.ctx.gasPerPubdata
736
796
  })
737
797
  };
738
798
  if (input.ctx.resolvedToken.l2.toLowerCase() === ZERO_L2_TOKEN_ADDRESS3) {
@@ -809,6 +869,7 @@ function routeEthNonBase() {
809
869
  ctx,
810
870
  modelTx: l2TxModel,
811
871
  priorityFloorGasLimit: priorityGasModel.priorityFloorGasLimit,
872
+ priorityTxL2Leg: priorityGasModel.priorityTxL2Leg,
812
873
  undeployedGasLimit: priorityGasModel.undeployedGasLimit
813
874
  });
814
875
  if (!l2GasParams) throw new Error("Failed to estimate L2 gas parameters.");
@@ -820,21 +881,24 @@ function routeEthNonBase() {
820
881
  const allowance = await wrapAs3(
821
882
  "RPC",
822
883
  OP_DEPOSITS.ethNonBase.allowanceBase,
823
- () => erc20Base.allowance(ctx.sender, ctx.l1AssetRouter),
884
+ () => erc20Base.allowance(ctx.sender, ctx.l1NativeTokenVault),
824
885
  {
825
- ctx: { where: "erc20.allowance", token: baseToken, spender: ctx.l1AssetRouter },
886
+ ctx: { where: "erc20.allowance", token: baseToken, spender: ctx.l1NativeTokenVault },
826
887
  message: "Failed to read base-token allowance."
827
888
  }
828
889
  );
829
890
  if (allowance < mintValue) {
830
- approvals.push({ token: baseToken, spender: ctx.l1AssetRouter, amount: mintValue });
891
+ approvals.push({ token: baseToken, spender: ctx.l1NativeTokenVault, amount: mintValue });
831
892
  steps.push({
832
- key: `approve:${baseToken}:${ctx.l1AssetRouter}`,
893
+ key: `approve:${baseToken}:${ctx.l1NativeTokenVault}`,
833
894
  kind: "approve",
834
895
  description: `Approve base token for fees (mintValue)`,
835
896
  tx: {
836
897
  to: baseToken,
837
- data: erc20Base.interface.encodeFunctionData("approve", [ctx.l1AssetRouter, mintValue]),
898
+ data: erc20Base.interface.encodeFunctionData("approve", [
899
+ ctx.l1NativeTokenVault,
900
+ mintValue
901
+ ]),
838
902
  from: ctx.sender,
839
903
  ...ctx.gasOverrides
840
904
  }
@@ -843,10 +907,10 @@ function routeEthNonBase() {
843
907
  const secondBridgeCalldata = await wrapAs3(
844
908
  "INTERNAL",
845
909
  OP_DEPOSITS.ethNonBase.encodeCalldata,
846
- () => Promise.resolve(encodeSecondBridgeEthArgs(p.amount, receiver)),
910
+ () => encodeSecondBridgeEthDepositCalldata({ ctx, amount: p.amount, receiver }),
847
911
  {
848
912
  ctx: {
849
- where: "encodeSecondBridgeEthArgs",
913
+ where: "encodeSecondBridgeEthDepositCalldata",
850
914
  amount: p.amount.toString(),
851
915
  to: receiver
852
916
  }
@@ -950,9 +1014,13 @@ function routeErc20Base() {
950
1014
  l2Calldata,
951
1015
  gasPerPubdata: ctx.gasPerPubdata
952
1016
  });
953
- const quotedL2GasLimit = ctx.l2GasLimit ?? applyPriorityL2GasLimitBuffer({
954
- chainIdL2: ctx.chainIdL2,
955
- gasLimit: priorityFloorBreakdown.derivedL2GasLimit
1017
+ const quotedL2GasLimit = ctx.l2GasLimit ?? clampPriorityL2GasLimit({
1018
+ gasLimit: applyPriorityL2GasLimitBuffer({
1019
+ chainIdL2: ctx.chainIdL2,
1020
+ gasLimit: priorityFloorBreakdown.derivedL2GasLimit
1021
+ }),
1022
+ l2Calldata,
1023
+ gasPerPubdata: ctx.gasPerPubdata
956
1024
  });
957
1025
  const l2GasParams = await quoteL2Gas3({
958
1026
  ctx,
@@ -969,21 +1037,24 @@ function routeErc20Base() {
969
1037
  const allowance = await wrapAs4(
970
1038
  "RPC",
971
1039
  OP_DEPOSITS.base.allowance,
972
- () => erc20.allowance(ctx.sender, ctx.l1AssetRouter),
1040
+ () => erc20.allowance(ctx.sender, ctx.l1NativeTokenVault),
973
1041
  {
974
- ctx: { where: "erc20.allowance", token: baseToken, spender: ctx.l1AssetRouter },
1042
+ ctx: { where: "erc20.allowance", token: baseToken, spender: ctx.l1NativeTokenVault },
975
1043
  message: "Failed to read base-token allowance."
976
1044
  }
977
1045
  );
978
1046
  if (allowance < mintValue) {
979
- approvals.push({ token: baseToken, spender: ctx.l1AssetRouter, amount: mintValue });
1047
+ approvals.push({ token: baseToken, spender: ctx.l1NativeTokenVault, amount: mintValue });
980
1048
  steps.push({
981
- key: `approve:${baseToken}:${ctx.l1AssetRouter}`,
1049
+ key: `approve:${baseToken}:${ctx.l1NativeTokenVault}`,
982
1050
  kind: "approve",
983
1051
  description: "Approve base token for mintValue",
984
1052
  tx: {
985
1053
  to: baseToken,
986
- data: erc20.interface.encodeFunctionData("approve", [ctx.l1AssetRouter, mintValue]),
1054
+ data: erc20.interface.encodeFunctionData("approve", [
1055
+ ctx.l1NativeTokenVault,
1056
+ mintValue
1057
+ ]),
987
1058
  from: ctx.sender,
988
1059
  ...ctx.gasOverrides
989
1060
  }
@@ -1117,8 +1188,17 @@ function createTokensResource(client) {
1117
1188
  const { chainId } = await client.l2.getNetwork();
1118
1189
  return await client.baseToken(BigInt(chainId));
1119
1190
  }
1120
- const { l2AssetRouter } = await client.contracts();
1121
- const l1Token = await l2AssetRouter.l1TokenAddress(l2Token);
1191
+ const { l2NativeTokenVault, l1NativeTokenVault } = await client.contracts();
1192
+ const assetId = await l2NativeTokenVault.assetId(l2Token);
1193
+ if (BigInt(assetId) === 0n) {
1194
+ throw new Error(`Token ${l2Token} is not registered in the L2 NativeTokenVault.`);
1195
+ }
1196
+ const l1Token = await l1NativeTokenVault.tokenAddress(assetId);
1197
+ if (BigInt(l1Token) === 0n) {
1198
+ throw new Error(
1199
+ `Token ${l2Token} has no L1 counterpart registered in the L1 NativeTokenVault.`
1200
+ );
1201
+ }
1122
1202
  return l1Token;
1123
1203
  });
1124
1204
  }
@@ -1,5 +1,5 @@
1
- import { assertNever, createError, OP_WITHDRAWALS } from './chunk-AMRHBZIY.js';
2
- import { L2_INTEROP_CENTER_ADDRESS, L2_INTEROP_ATTRIBUTE_PARSER_ADDRESS, BUNDLE_IDENTIFIER } from './chunk-NQRYXL3K.js';
1
+ import { assertNever, createError, OP_WITHDRAWALS } from './chunk-JNS4XZE2.js';
2
+ import { L2_INTEROP_CENTER_ADDRESS, L2_INTEROP_ATTRIBUTE_PARSER_ADDRESS, BUNDLE_IDENTIFIER } from './chunk-3IPSDGHO.js';
3
3
  import { keccak_256 } from '@noble/hashes/sha3';
4
4
  import { bytesToHex, hexToBytes } from '@noble/hashes/utils';
5
5
 
@@ -1,5 +1,5 @@
1
- import { createErrorOps, REVERT_TO_READINESS } from './chunk-KL6ZCPWJ.js';
2
- import { IL1Nullifier_default, IERC20_default, L1NativeTokenVault_default, L2NativeTokenVault_default, Mailbox_default, IL1ContractErrors_default, IInteropErrors_default } from './chunk-AMRHBZIY.js';
1
+ import { createErrorOps, REVERT_TO_READINESS } from './chunk-4ZANKNIK.js';
2
+ import { IL1Nullifier_default, IERC20_default, L1NativeTokenVault_default, L2NativeTokenVault_default, Mailbox_default, IL1ContractErrors_default, IInteropErrors_default } from './chunk-JNS4XZE2.js';
3
3
  import { decodeErrorResult } from 'viem';
4
4
 
5
5
  var ERROR_ABIS = [];
@@ -1,4 +1,4 @@
1
- import { __export, ETH_ADDRESS, FORMAL_ETH_ADDRESS, L2_BASE_TOKEN_ADDRESS } from './chunk-NQRYXL3K.js';
1
+ import { __export, ETH_ADDRESS, FORMAL_ETH_ADDRESS, L2_BASE_TOKEN_ADDRESS } from './chunk-3IPSDGHO.js';
2
2
 
3
3
  // src/core/internal/abis/IBridgehub.ts
4
4
  var IBridgehubABI = [
@@ -2743,13 +2743,6 @@ var IL2AssetRouterABI = [
2743
2743
  outputs: [{ name: "", type: "address", internalType: "address" }],
2744
2744
  stateMutability: "view"
2745
2745
  },
2746
- {
2747
- type: "function",
2748
- name: "l1TokenAddress",
2749
- inputs: [{ name: "_l2Token", type: "address", internalType: "address" }],
2750
- outputs: [{ name: "", type: "address", internalType: "address" }],
2751
- stateMutability: "view"
2752
- },
2753
2746
  {
2754
2747
  type: "function",
2755
2748
  name: "l2TokenAddress",
@@ -7259,7 +7252,7 @@ var OP_DEPOSITS = {
7259
7252
  baseCost: "deposits.eth-nonbase:l2TransactionBaseCost",
7260
7253
  allowanceBase: "deposits.eth-nonbase:allowanceBaseToken",
7261
7254
  ethBalance: "deposits.eth-nonbase:getEthBalance",
7262
- encodeCalldata: "deposits.eth-nonbase:encodeSecondBridgeEthArgs",
7255
+ encodeCalldata: "deposits.eth-nonbase:encodeSecondBridgeEthDepositCalldata",
7263
7256
  estGas: "deposits.eth-nonbase:estimateGas",
7264
7257
  assertEthAsset: "deposits.eth-nonbase:assertEthAsset",
7265
7258
  assertNonEthBase: "deposits.eth-nonbase:assertNonEthBase",
@@ -1,4 +1,4 @@
1
- import { L2_BASE_TOKEN_ADDRESS, TOPIC_L1_MESSAGE_SENT_NEW, TOPIC_L1_MESSAGE_SENT_LEG, L1_MESSENGER_ADDRESS, ETH_ADDRESS, L2_ASSET_ROUTER_ADDRESS } from './chunk-NQRYXL3K.js';
1
+ import { L2_BASE_TOKEN_ADDRESS, TOPIC_L1_MESSAGE_SENT_NEW, TOPIC_L1_MESSAGE_SENT_LEG, L1_MESSENGER_ADDRESS, ETH_ADDRESS, L2_ASSET_ROUTER_ADDRESS } from './chunk-3IPSDGHO.js';
2
2
 
3
3
  // src/core/resources/withdrawals/route.ts
4
4
  function normalizeTokenForRouting(token) {
@@ -1,8 +1,8 @@
1
- import { createErrorHandlers } from './chunk-CPNHKNI4.js';
1
+ import { createErrorHandlers } from './chunk-RZH7HBH3.js';
2
2
  import { unpackSemver } from './chunk-UMPAKZCQ.js';
3
3
  import { makeTransportFromEthers } from './chunk-BWKWWLY4.js';
4
- import { createError, OP_CLIENT, IBridgehub_default, IL1AssetRouter_default, IL1Nullifier_default, L2MessageVerification_default, IInteropHandler_default, IInteropCenter_default, IBaseToken_default, L2NativeTokenVault_default, IL2AssetRouter_default, L1NativeTokenVault_default, OP_DEPOSITS, createZksRpc } from './chunk-AMRHBZIY.js';
5
- import { L2_ASSET_ROUTER_ADDRESS, L2_NATIVE_TOKEN_VAULT_ADDRESS, L2_BASE_TOKEN_ADDRESS, L2_INTEROP_CENTER_ADDRESS, L2_INTEROP_HANDLER_ADDRESS, L2_MESSAGE_VERIFICATION_ADDRESS, FORMAL_ETH_ADDRESS } from './chunk-NQRYXL3K.js';
4
+ import { createError, OP_CLIENT, IBridgehub_default, IL1AssetRouter_default, IL1Nullifier_default, L2MessageVerification_default, IInteropHandler_default, IInteropCenter_default, IBaseToken_default, L2NativeTokenVault_default, IL2AssetRouter_default, L1NativeTokenVault_default, OP_DEPOSITS, createZksRpc } from './chunk-JNS4XZE2.js';
5
+ import { L2_ASSET_ROUTER_ADDRESS, L2_NATIVE_TOKEN_VAULT_ADDRESS, L2_BASE_TOKEN_ADDRESS, L2_INTEROP_CENTER_ADDRESS, L2_INTEROP_HANDLER_ADDRESS, L2_MESSAGE_VERIFICATION_ADDRESS, FORMAL_ETH_ADDRESS } from './chunk-3IPSDGHO.js';
6
6
  import { BrowserProvider, Interface, Contract } from 'ethers';
7
7
 
8
8
  // src/adapters/ethers/rpc.ts