@matterlabs/zksync-js 0.0.22 → 0.0.23

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 (49) 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 +185 -90
  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 +185 -93
  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 +177 -89
  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 +177 -92
  21. package/dist/adapters/viem/sdk.cjs.map +1 -1
  22. package/dist/adapters/viem/sdk.js +8 -8
  23. package/dist/{chunk-AMRHBZIY.js → chunk-2DDJFHHD.js} +1 -8
  24. package/dist/{chunk-NQRYXL3K.js → chunk-3IPSDGHO.js} +17 -1
  25. package/dist/{chunk-KL6ZCPWJ.js → chunk-4GPIHYVF.js} +1 -1
  26. package/dist/{chunk-2D3FBCZC.js → chunk-4M7VNYGC.js} +2 -2
  27. package/dist/{chunk-JXBLQQEN.js → chunk-6WIAMFIW.js} +3 -3
  28. package/dist/{chunk-QUAPG3ZR.js → chunk-JJ523MOL.js} +2 -2
  29. package/dist/{chunk-4K4LOCQJ.js → chunk-NVOFHV3A.js} +113 -54
  30. package/dist/{chunk-32N6TI6K.js → chunk-OEUDZFXH.js} +1 -1
  31. package/dist/{chunk-CPNHKNI4.js → chunk-TUN6NH5D.js} +2 -2
  32. package/dist/{chunk-PI4PF6WT.js → chunk-URHDNDFN.js} +3 -3
  33. package/dist/{chunk-CP4SQ5PM.js → chunk-V2TDNGI5.js} +121 -55
  34. package/dist/{chunk-3SPDWWRD.js → chunk-WPCZNITC.js} +60 -32
  35. package/dist/{chunk-CUBUD4J4.js → chunk-X2JJDQ4O.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/index.cjs +16 -7
  47. package/dist/index.cjs.map +1 -1
  48. package/dist/index.js +4 -4
  49. 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-NVOFHV3A.js';
2
+ import '../../chunk-WPCZNITC.js';
3
+ import '../../chunk-JJ523MOL.js';
4
+ import '../../chunk-OEUDZFXH.js';
5
+ import '../../chunk-4M7VNYGC.js';
6
+ import '../../chunk-4GPIHYVF.js';
7
+ import '../../chunk-2DDJFHHD.js';
8
+ import '../../chunk-3IPSDGHO.js';
@@ -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",
@@ -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-2DDJFHHD.js';
2
2
 
3
3
  // src/core/errors/error-ops.ts
4
4
  function resolveMessage(op, msg) {
@@ -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-4GPIHYVF.js';
2
+ import { IL1Nullifier_default, IERC20_default, L1NativeTokenVault_default, L2NativeTokenVault_default, Mailbox_default, IL1ContractErrors_default, IInteropErrors_default } from './chunk-2DDJFHHD.js';
3
3
  import { decodeErrorResult } from 'viem';
4
4
 
5
5
  var ERROR_ABIS = [];
@@ -1,8 +1,8 @@
1
- import { createErrorHandlers } from './chunk-2D3FBCZC.js';
1
+ import { createErrorHandlers } from './chunk-4M7VNYGC.js';
2
2
  import { unpackSemver } from './chunk-UMPAKZCQ.js';
3
3
  import { makeTransportFromViem } from './chunk-BWKWWLY4.js';
4
- import { OP_CLIENT, IBridgehub_default, IL1AssetRouter_default, IL1Nullifier_default, IBaseToken_default, L2NativeTokenVault_default, IL2AssetRouter_default, L1NativeTokenVault_default, createError, 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 { OP_CLIENT, IBridgehub_default, IL1AssetRouter_default, IL1Nullifier_default, IBaseToken_default, L2NativeTokenVault_default, IL2AssetRouter_default, L1NativeTokenVault_default, createError, createZksRpc } from './chunk-2DDJFHHD.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 { getContract, createWalletClient, custom } from 'viem';
7
7
 
8
8
  // src/adapters/viem/rpc.ts
@@ -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-2DDJFHHD.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,14 +1,14 @@
1
- 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, quoteL1Gas, derivePriorityBodyGasEstimateCap, assertProtocolVersion, quoteL2Gas2 } from './chunk-3SPDWWRD.js';
2
- import { detectWithdrawalProtocol, buildWithdrawalFinalization, parseBundleHashFromLogs, classifyWithdrawalOutcome, phaseFromReadiness, buildWithdrawalBundle } from './chunk-QUAPG3ZR.js';
3
- import { findL1MessageSentLog, messengerLogIndex, l1MessageSentSender, pickWithdrawRoute } from './chunk-32N6TI6K.js';
4
- import { createErrorHandlers, toZKsyncError, classifyReadinessFromRevert } from './chunk-2D3FBCZC.js';
5
- import { IERC7786Attributes_default, isHash66, IL1Nullifier_default, IInteropHandler_default, OP_WITHDRAWALS, createError, normalizeL1Token, isAddressEq, hexEq, OP_DEPOSITS, IERC20_default, isZKsyncError, isReceiptNotFound, IL1NullifierV32_default, OP_INTEROP, IInteropRootStorage_default, IInteropCenter_default, sleep, IBridgehub_default, isETH, normalizeAddrEq, IL2AssetRouter_default, L2NativeTokenVault_default, IBaseToken_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 { 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, quoteL1Gas, applyL1ToL2Alias, derivePriorityBodyGasEstimateCap, assertProtocolVersion, resolveRegisteredTokenPriorityL2GasLimit, quoteL2Gas2 } from './chunk-WPCZNITC.js';
2
+ import { detectWithdrawalProtocol, buildWithdrawalFinalization, parseBundleHashFromLogs, classifyWithdrawalOutcome, phaseFromReadiness, buildWithdrawalBundle } from './chunk-JJ523MOL.js';
3
+ import { findL1MessageSentLog, messengerLogIndex, l1MessageSentSender, pickWithdrawRoute } from './chunk-OEUDZFXH.js';
4
+ import { createErrorHandlers, toZKsyncError, classifyReadinessFromRevert } from './chunk-4M7VNYGC.js';
5
+ import { IERC7786Attributes_default, isHash66, IL1Nullifier_default, IInteropHandler_default, OP_WITHDRAWALS, createError, normalizeL1Token, isAddressEq, hexEq, OP_DEPOSITS, IERC20_default, isZKsyncError, isReceiptNotFound, IL1NullifierV32_default, OP_INTEROP, IInteropRootStorage_default, IInteropCenter_default, sleep, IBridgehub_default, isETH, normalizeAddrEq, IL2AssetRouter_default, L2NativeTokenVault_default, IBaseToken_default, assertNever } from './chunk-2DDJFHHD.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 { keccak256, encodeAbiParameters, toBytes, encodeFunctionData, concat, decodeEventLog, createWalletClient, custom, decodeAbiParameters, createPublicClient, http, encodeEventTopics, numberToHex, zeroAddress, getAddress, toHex } from 'viem';
8
8
 
9
9
  // src/adapters/viem/resources/deposits/context.ts
10
10
  async function commonCtx(p, client, tokens, contracts) {
11
- const { bridgehub, l1AssetRouter } = await contracts.addresses();
11
+ const { bridgehub, l1AssetRouter, l1NativeTokenVault } = await contracts.addresses();
12
12
  const chainId = await client.l2.getChainId();
13
13
  const sender = client.account.address;
14
14
  const gasPerPubdata = p.gasPerPubdata ?? 800n;
@@ -36,6 +36,7 @@ async function commonCtx(p, client, tokens, contracts) {
36
36
  baseTokenL1,
37
37
  baseIsEth,
38
38
  l1AssetRouter,
39
+ l1NativeTokenVault,
39
40
  route,
40
41
  bridgehub,
41
42
  chainIdL2: BigInt(chainId),
@@ -148,6 +149,20 @@ function viemToGasEstimator(client) {
148
149
  maxPriorityFeePerGas: tx.maxPriorityFeePerGas
149
150
  });
150
151
  },
152
+ async estimatePriorityTxGas(tx) {
153
+ const result = await client.request({
154
+ method: "eth_estimateGas",
155
+ params: [
156
+ {
157
+ from: tx.from,
158
+ to: tx.to,
159
+ data: tx.data,
160
+ type: ZKSYNC_OS_PRIORITY_TX_TYPE
161
+ }
162
+ ]
163
+ });
164
+ return BigInt(result);
165
+ },
151
166
  async estimateFeesPerGas() {
152
167
  try {
153
168
  const fees = await client.estimateFeesPerGas();
@@ -181,6 +196,14 @@ function viemToGasEstimator(client) {
181
196
 
182
197
  // src/adapters/viem/resources/deposits/services/gas.ts
183
198
  var DEFAULT_SAFE_NONBASE_L2_GAS_LIMIT = 3000000n;
199
+ async function estimatePriorityTxL2Gas(ctx, leg) {
200
+ if (!leg) return void 0;
201
+ try {
202
+ return await viemToGasEstimator(ctx.client.l2).estimatePriorityTxGas?.(leg);
203
+ } catch {
204
+ return void 0;
205
+ }
206
+ }
184
207
  async function quoteL1Gas2(input) {
185
208
  const { ctx, tx, overrides, fallbackGasLimit } = input;
186
209
  const estimator = viemToGasEstimator(ctx.client.l1);
@@ -235,7 +258,12 @@ async function determineNonBaseL2Gas(input) {
235
258
  return quoteL2Gas3({
236
259
  ctx,
237
260
  route,
238
- overrideGasLimit: input.priorityFloorGasLimit
261
+ overrideGasLimit: resolveRegisteredTokenPriorityL2GasLimit({
262
+ chainIdL2: ctx.chainIdL2,
263
+ priorityFloorGasLimit: input.priorityFloorGasLimit,
264
+ gasPerPubdata: ctx.gasPerPubdata,
265
+ nodeEstimate: await estimatePriorityTxL2Gas(ctx, input.priorityTxL2Leg)
266
+ })
239
267
  });
240
268
  }
241
269
  const modelTx = {
@@ -272,6 +300,7 @@ async function determineEthNonBaseL2Gas(input) {
272
300
  knownL2Token: input.ctx.resolvedToken?.l2,
273
301
  modelTx: input.modelTx,
274
302
  priorityFloorGasLimit: input.priorityFloorGasLimit,
303
+ priorityTxL2Leg: input.priorityTxL2Leg,
275
304
  undeployedGasLimit: input.undeployedGasLimit
276
305
  });
277
306
  }
@@ -373,9 +402,13 @@ function routeEthDirect() {
373
402
  l2Calldata,
374
403
  gasPerPubdata: ctx.gasPerPubdata
375
404
  });
376
- const quotedL2GasLimit = ctx.l2GasLimit ?? applyPriorityL2GasLimitBuffer({
377
- chainIdL2: ctx.chainIdL2,
378
- gasLimit: priorityFloorBreakdown.derivedL2GasLimit
405
+ const quotedL2GasLimit = ctx.l2GasLimit ?? clampPriorityL2GasLimit({
406
+ gasLimit: applyPriorityL2GasLimitBuffer({
407
+ chainIdL2: ctx.chainIdL2,
408
+ gasLimit: priorityFloorBreakdown.derivedL2GasLimit
409
+ }),
410
+ l2Calldata,
411
+ gasPerPubdata: ctx.gasPerPubdata
379
412
  });
380
413
  const l2GasParams = await quoteL2Gas3({
381
414
  ctx,
@@ -521,26 +554,18 @@ var ntvCodec = createNTVCodec({
521
554
  keccak256
522
555
  });
523
556
  async function encodeSecondBridgeErc20DepositCalldata(input) {
524
- if (!input.ctx.resolvedToken) {
525
- return encodeSecondBridgeErc20Args(input.token, input.amount, input.receiver);
526
- }
527
- const l1ChainId = BigInt(await input.ctx.client.l1.getChainId());
528
- const expectedL1AssetId = ntvCodec.encodeAssetId(
529
- l1ChainId,
557
+ const registeredAssetId = input.ctx.resolvedToken?.assetId;
558
+ const assetId = registeredAssetId && registeredAssetId.toLowerCase() !== ZERO_ASSET_ID ? registeredAssetId : ntvCodec.encodeAssetId(
559
+ BigInt(await input.ctx.client.l1.getChainId()),
530
560
  L2_NATIVE_TOKEN_VAULT_ADDRESS,
531
561
  input.token
532
562
  );
533
- const assetId = input.ctx.resolvedToken.assetId.toLowerCase();
534
- const isL1Origin = assetId === ZERO_ASSET_ID || assetId === expectedL1AssetId.toLowerCase();
535
- if (isL1Origin) {
536
- return encodeSecondBridgeErc20Args(input.token, input.amount, input.receiver);
537
- }
538
563
  const transferData = encodeNativeTokenVaultTransferData(
539
564
  input.amount,
540
565
  input.receiver,
541
566
  input.token
542
567
  );
543
- return encodeSecondBridgeDataV1(input.ctx.resolvedToken.assetId, transferData);
568
+ return encodeSecondBridgeDataV1(assetId, transferData);
544
569
  }
545
570
  async function getPriorityGasModel(input) {
546
571
  try {
@@ -582,9 +607,18 @@ async function getPriorityGasModel(input) {
582
607
  gasPerPubdata: input.ctx.gasPerPubdata
583
608
  });
584
609
  const model = {
585
- priorityFloorGasLimit: applyPriorityL2GasLimitBuffer({
586
- chainIdL2: input.ctx.chainIdL2,
587
- gasLimit: priorityFloorBreakdown.derivedL2GasLimit
610
+ priorityTxL2Leg: {
611
+ from: applyL1ToL2Alias(input.ctx.l1AssetRouter),
612
+ to: L2_ASSET_ROUTER_ADDRESS,
613
+ data: l2Calldata
614
+ },
615
+ priorityFloorGasLimit: clampPriorityL2GasLimit({
616
+ gasLimit: applyPriorityL2GasLimitBuffer({
617
+ chainIdL2: input.ctx.chainIdL2,
618
+ gasLimit: priorityFloorBreakdown.derivedL2GasLimit
619
+ }),
620
+ l2Calldata,
621
+ gasPerPubdata: input.ctx.gasPerPubdata
588
622
  })
589
623
  };
590
624
  if (isFirstBridge || input.ctx.resolvedToken.l2.toLowerCase() === zeroAddress) {
@@ -627,6 +661,7 @@ function routeErc20NonBase() {
627
661
  const baseToken = ctx.baseTokenL1 ?? await ctx.client.baseToken(ctx.chainIdL2);
628
662
  const baseIsEth = ctx.baseIsEth ?? isETH(baseToken);
629
663
  const assetRouter = ctx.l1AssetRouter;
664
+ const nativeTokenVault = ctx.l1NativeTokenVault;
630
665
  const receiver = p.to ?? ctx.sender;
631
666
  const secondBridgeCalldata = await wrapAs3(
632
667
  "INTERNAL",
@@ -656,6 +691,7 @@ function routeErc20NonBase() {
656
691
  ctx,
657
692
  l1Token: p.token,
658
693
  priorityFloorGasLimit: priorityGasModel.priorityFloorGasLimit,
694
+ priorityTxL2Leg: priorityGasModel.priorityTxL2Leg,
659
695
  undeployedGasLimit: priorityGasModel.undeployedGasLimit,
660
696
  modelTx: {
661
697
  to: receiver,
@@ -676,10 +712,10 @@ function routeErc20NonBase() {
676
712
  address: p.token,
677
713
  abi: IERC20_default,
678
714
  functionName: "allowance",
679
- args: [ctx.sender, assetRouter]
715
+ args: [ctx.sender, nativeTokenVault]
680
716
  }),
681
717
  {
682
- ctx: { where: "erc20.allowance", token: p.token, spender: assetRouter },
718
+ ctx: { where: "erc20.allowance", token: p.token, spender: nativeTokenVault },
683
719
  message: "Failed to read deposit-token allowance."
684
720
  }
685
721
  );
@@ -690,7 +726,7 @@ function routeErc20NonBase() {
690
726
  () => buildApprovalRequest({
691
727
  ctx,
692
728
  token: p.token,
693
- spender: assetRouter,
729
+ spender: nativeTokenVault,
694
730
  amount: p.amount
695
731
  }),
696
732
  {
@@ -698,9 +734,9 @@ function routeErc20NonBase() {
698
734
  message: "Failed to simulate deposit token approve."
699
735
  }
700
736
  );
701
- approvals.push({ token: p.token, spender: assetRouter, amount: p.amount });
737
+ approvals.push({ token: p.token, spender: nativeTokenVault, amount: p.amount });
702
738
  steps.push({
703
- key: `approve:${p.token}:${assetRouter}`,
739
+ key: `approve:${p.token}:${nativeTokenVault}`,
704
740
  kind: "approve",
705
741
  description: `Approve deposit token for amount`,
706
742
  tx: approveTx
@@ -714,10 +750,10 @@ function routeErc20NonBase() {
714
750
  address: baseToken,
715
751
  abi: IERC20_default,
716
752
  functionName: "allowance",
717
- args: [ctx.sender, assetRouter]
753
+ args: [ctx.sender, nativeTokenVault]
718
754
  }),
719
755
  {
720
- ctx: { where: "erc20.allowance", token: baseToken, spender: assetRouter },
756
+ ctx: { where: "erc20.allowance", token: baseToken, spender: nativeTokenVault },
721
757
  message: "Failed to read base-token allowance."
722
758
  }
723
759
  );
@@ -728,7 +764,7 @@ function routeErc20NonBase() {
728
764
  () => buildApprovalRequest({
729
765
  ctx,
730
766
  token: baseToken,
731
- spender: assetRouter,
767
+ spender: nativeTokenVault,
732
768
  amount: mintValue
733
769
  }),
734
770
  {
@@ -736,9 +772,9 @@ function routeErc20NonBase() {
736
772
  message: "Failed to simulate base token approve."
737
773
  }
738
774
  );
739
- approvals.push({ token: baseToken, spender: assetRouter, amount: mintValue });
775
+ approvals.push({ token: baseToken, spender: nativeTokenVault, amount: mintValue });
740
776
  steps.push({
741
- key: `approve:${baseToken}:${assetRouter}`,
777
+ key: `approve:${baseToken}:${nativeTokenVault}`,
742
778
  kind: "approve",
743
779
  description: `Approve base token for mintValue`,
744
780
  tx: approveBaseTx
@@ -877,9 +913,18 @@ async function getPriorityGasModel2(input) {
877
913
  gasPerPubdata: input.ctx.gasPerPubdata
878
914
  });
879
915
  const model = {
880
- priorityFloorGasLimit: applyPriorityL2GasLimitBuffer({
881
- chainIdL2: input.ctx.chainIdL2,
882
- gasLimit: priorityFloorBreakdown.derivedL2GasLimit
916
+ priorityTxL2Leg: {
917
+ from: applyL1ToL2Alias(input.ctx.l1AssetRouter),
918
+ to: L2_ASSET_ROUTER_ADDRESS,
919
+ data: l2Calldata
920
+ },
921
+ priorityFloorGasLimit: clampPriorityL2GasLimit({
922
+ gasLimit: applyPriorityL2GasLimitBuffer({
923
+ chainIdL2: input.ctx.chainIdL2,
924
+ gasLimit: priorityFloorBreakdown.derivedL2GasLimit
925
+ }),
926
+ l2Calldata,
927
+ gasPerPubdata: input.ctx.gasPerPubdata
883
928
  })
884
929
  };
885
930
  if (input.ctx.resolvedToken.l2.toLowerCase() === zeroAddress) {
@@ -954,6 +999,7 @@ function routeEthNonBase() {
954
999
  ctx,
955
1000
  modelTx: l2TxModel,
956
1001
  priorityFloorGasLimit: priorityGasModel.priorityFloorGasLimit,
1002
+ priorityTxL2Leg: priorityGasModel.priorityTxL2Leg,
957
1003
  undeployedGasLimit: priorityGasModel.undeployedGasLimit
958
1004
  });
959
1005
  if (!l2Gas) throw new Error("Failed to estimate L2 gas parameters.");
@@ -968,10 +1014,10 @@ function routeEthNonBase() {
968
1014
  address: baseToken,
969
1015
  abi: IERC20_default,
970
1016
  functionName: "allowance",
971
- args: [ctx.sender, ctx.l1AssetRouter]
1017
+ args: [ctx.sender, ctx.l1NativeTokenVault]
972
1018
  }),
973
1019
  {
974
- ctx: { where: "erc20.allowance", token: baseToken, spender: ctx.l1AssetRouter },
1020
+ ctx: { where: "erc20.allowance", token: baseToken, spender: ctx.l1NativeTokenVault },
975
1021
  message: "Failed to read base-token allowance."
976
1022
  }
977
1023
  );
@@ -983,7 +1029,7 @@ function routeEthNonBase() {
983
1029
  () => buildApprovalRequest({
984
1030
  ctx,
985
1031
  token: baseToken,
986
- spender: ctx.l1AssetRouter,
1032
+ spender: ctx.l1NativeTokenVault,
987
1033
  amount: mintValue
988
1034
  }),
989
1035
  {
@@ -991,9 +1037,9 @@ function routeEthNonBase() {
991
1037
  message: "Failed to simulate base-token approve."
992
1038
  }
993
1039
  );
994
- approvals.push({ token: baseToken, spender: ctx.l1AssetRouter, amount: mintValue });
1040
+ approvals.push({ token: baseToken, spender: ctx.l1NativeTokenVault, amount: mintValue });
995
1041
  steps.push({
996
- key: `approve:${baseToken}:${ctx.l1AssetRouter}`,
1042
+ key: `approve:${baseToken}:${ctx.l1NativeTokenVault}`,
997
1043
  kind: "approve",
998
1044
  description: `Approve base token for fees (mintValue)`,
999
1045
  tx: approveTx
@@ -1146,9 +1192,13 @@ function routeErc20Base() {
1146
1192
  l2Calldata,
1147
1193
  gasPerPubdata: ctx.gasPerPubdata
1148
1194
  });
1149
- const quotedL2GasLimit = ctx.l2GasLimit ?? applyPriorityL2GasLimitBuffer({
1150
- chainIdL2: ctx.chainIdL2,
1151
- gasLimit: priorityFloorBreakdown.derivedL2GasLimit
1195
+ const quotedL2GasLimit = ctx.l2GasLimit ?? clampPriorityL2GasLimit({
1196
+ gasLimit: applyPriorityL2GasLimitBuffer({
1197
+ chainIdL2: ctx.chainIdL2,
1198
+ gasLimit: priorityFloorBreakdown.derivedL2GasLimit
1199
+ }),
1200
+ l2Calldata,
1201
+ gasPerPubdata: ctx.gasPerPubdata
1152
1202
  });
1153
1203
  const l2Gas = await quoteL2Gas3({
1154
1204
  ctx,
@@ -1167,10 +1217,10 @@ function routeErc20Base() {
1167
1217
  address: baseToken,
1168
1218
  abi: IERC20_default,
1169
1219
  functionName: "allowance",
1170
- args: [ctx.sender, ctx.l1AssetRouter]
1220
+ args: [ctx.sender, ctx.l1NativeTokenVault]
1171
1221
  }),
1172
1222
  {
1173
- ctx: { where: "erc20.allowance", token: baseToken, spender: ctx.l1AssetRouter },
1223
+ ctx: { where: "erc20.allowance", token: baseToken, spender: ctx.l1NativeTokenVault },
1174
1224
  message: "Failed to read base-token allowance."
1175
1225
  }
1176
1226
  );
@@ -1182,7 +1232,7 @@ function routeErc20Base() {
1182
1232
  () => buildApprovalRequest({
1183
1233
  ctx,
1184
1234
  token: baseToken,
1185
- spender: ctx.l1AssetRouter,
1235
+ spender: ctx.l1NativeTokenVault,
1186
1236
  amount: mintValue
1187
1237
  }),
1188
1238
  {
@@ -1190,9 +1240,9 @@ function routeErc20Base() {
1190
1240
  message: "Failed to simulate ERC-20 approve."
1191
1241
  }
1192
1242
  );
1193
- approvals.push({ token: baseToken, spender: ctx.l1AssetRouter, amount: mintValue });
1243
+ approvals.push({ token: baseToken, spender: ctx.l1NativeTokenVault, amount: mintValue });
1194
1244
  steps.push({
1195
- key: `approve:${baseToken}:${ctx.l1AssetRouter}`,
1245
+ key: `approve:${baseToken}:${ctx.l1NativeTokenVault}`,
1196
1246
  kind: "approve",
1197
1247
  description: "Approve base token for mintValue",
1198
1248
  tx: approveTx
@@ -1438,8 +1488,17 @@ function createTokensResource(client) {
1438
1488
  const chainId = BigInt(await client.l2.getChainId());
1439
1489
  return await client.baseToken(chainId);
1440
1490
  }
1441
- const { l2AssetRouter } = await client.contracts();
1442
- const l1Token = await l2AssetRouter.read.l1TokenAddress([l2Token]);
1491
+ const { l2NativeTokenVault, l1NativeTokenVault } = await client.contracts();
1492
+ const assetId = await l2NativeTokenVault.read.assetId([l2Token]);
1493
+ if (BigInt(assetId) === 0n) {
1494
+ throw new Error(`Token ${l2Token} is not registered in the L2 NativeTokenVault.`);
1495
+ }
1496
+ const l1Token = await l1NativeTokenVault.read.tokenAddress([assetId]);
1497
+ if (BigInt(l1Token) === 0n) {
1498
+ throw new Error(
1499
+ `Token ${l2Token} has no L1 counterpart registered in the L1 NativeTokenVault.`
1500
+ );
1501
+ }
1443
1502
  return l1Token;
1444
1503
  });
1445
1504
  }
@@ -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,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-4GPIHYVF.js';
2
+ import { IL1Nullifier_default, IERC20_default, L1NativeTokenVault_default, L2NativeTokenVault_default, Mailbox_default, IL1ContractErrors_default, IInteropErrors_default } from './chunk-2DDJFHHD.js';
3
3
  import { Interface } from 'ethers';
4
4
 
5
5
  var ERROR_IFACES = [];
@@ -1,8 +1,8 @@
1
- import { createErrorHandlers } from './chunk-CPNHKNI4.js';
1
+ import { createErrorHandlers } from './chunk-TUN6NH5D.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-2DDJFHHD.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