@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,11 +1,11 @@
1
- export { createEthersClient as createClient, createEthersClient } from '../../chunk-PI4PF6WT.js';
2
- export { buildDirectRequestStruct, createDepositsResource, createEthersSdk, createFinalizationServices, createInteropFinalizationServices, createInteropResource, createTokensResource, createWithdrawalProtocolService, createWithdrawalsResource, encodeNativeTokenVaultTransferData, encodeSecondBridgeArgs, encodeSecondBridgeDataV1, encodeSecondBridgeErc20Args, encodeSecondBridgeEthArgs, getL2TransactionHashFromLogs } from '../../chunk-CP4SQ5PM.js';
3
- export { classifyReadinessFromRevert, createErrorHandlers, decodeRevert, registerErrorAbi, toZKsyncError } from '../../chunk-CPNHKNI4.js';
4
- import '../../chunk-3SPDWWRD.js';
5
- import '../../chunk-QUAPG3ZR.js';
6
- import '../../chunk-32N6TI6K.js';
1
+ export { createEthersClient as createClient, createEthersClient } from '../../chunk-URHDNDFN.js';
2
+ export { buildDirectRequestStruct, createDepositsResource, createEthersSdk, createFinalizationServices, createInteropFinalizationServices, createInteropResource, createTokensResource, createWithdrawalProtocolService, createWithdrawalsResource, encodeNativeTokenVaultTransferData, encodeSecondBridgeArgs, encodeSecondBridgeDataV1, encodeSecondBridgeErc20Args, encodeSecondBridgeEthArgs, getL2TransactionHashFromLogs } from '../../chunk-V2TDNGI5.js';
3
+ export { classifyReadinessFromRevert, createErrorHandlers, decodeRevert, registerErrorAbi, toZKsyncError } from '../../chunk-TUN6NH5D.js';
4
+ import '../../chunk-WPCZNITC.js';
5
+ import '../../chunk-JJ523MOL.js';
6
+ import '../../chunk-OEUDZFXH.js';
7
7
  import '../../chunk-UMPAKZCQ.js';
8
8
  import '../../chunk-BWKWWLY4.js';
9
- import '../../chunk-KL6ZCPWJ.js';
10
- import '../../chunk-AMRHBZIY.js';
11
- import '../../chunk-NQRYXL3K.js';
9
+ import '../../chunk-4GPIHYVF.js';
10
+ import '../../chunk-2DDJFHHD.js';
11
+ import '../../chunk-3IPSDGHO.js';
@@ -14,6 +14,7 @@ export interface BuildCtx extends CommonCtx {
14
14
  baseTokenL1: Address;
15
15
  baseIsEth: boolean;
16
16
  l1AssetRouter: Address;
17
+ l1NativeTokenVault: Address;
17
18
  gasOverrides?: TxGasOverrides;
18
19
  l2GasLimit?: bigint;
19
20
  gasPerPubdata: bigint;
@@ -29,6 +30,7 @@ export declare function commonCtx(p: DepositParams, client: EthersClient, tokens
29
30
  baseTokenL1: `0x${string}`;
30
31
  baseIsEth: boolean;
31
32
  l1AssetRouter: `0x${string}`;
33
+ l1NativeTokenVault: `0x${string}`;
32
34
  route: DepositRoute;
33
35
  bridgehub: `0x${string}`;
34
36
  chainIdL2: bigint;
@@ -4,6 +4,7 @@ import type { DepositRoute } from '../../../../../core/types/flows/deposits';
4
4
  import type { TxGasOverrides } from '../../../../../core/types/fees';
5
5
  import type { Address } from '../../../../../core/types/primitives';
6
6
  import { type GasQuote } from '../../../../../core/resources/deposits/gas';
7
+ import { type PriorityTxL2Leg } from '../../../../../core/resources/deposits/priority.ts';
7
8
  export type { GasQuote };
8
9
  export type QuoteL1GasInput = {
9
10
  ctx: BuildCtx;
@@ -35,11 +36,13 @@ export declare function determineErc20L2Gas(input: {
35
36
  l1Token: Address;
36
37
  modelTx?: TransactionRequest;
37
38
  priorityFloorGasLimit?: bigint;
39
+ priorityTxL2Leg?: PriorityTxL2Leg;
38
40
  undeployedGasLimit?: bigint;
39
41
  }): Promise<GasQuote | undefined>;
40
42
  export declare function determineEthNonBaseL2Gas(input: {
41
43
  ctx: BuildCtx;
42
44
  modelTx?: TransactionRequest;
43
45
  priorityFloorGasLimit?: bigint;
46
+ priorityTxL2Leg?: PriorityTxL2Leg;
44
47
  undeployedGasLimit?: bigint;
45
48
  }): Promise<GasQuote | undefined>;
@@ -47,6 +47,14 @@ var L1_TX_DELTA_FACTORY_DEPS_L2_GAS = 2473n;
47
47
  var L1_TX_DELTA_FACTORY_DEPS_PUBDATA = 64n;
48
48
  var TX_SLOT_OVERHEAD_L2_GAS = 10000n;
49
49
  var PRIORITY_TX_MAX_GAS_LIMIT = 72000000n;
50
+ var L1_TX_INTRINSIC_L2_GAS_ZKSYNC_OS = 21000n;
51
+ var L1_TX_CALLDATA_FLOOR_PRICE_L2_GAS_ZKSYNC_OS = 40n;
52
+ var L1_TX_INTRINSIC_PUBDATA_ZKSYNC_OS = 351n;
53
+ var MAX_NATIVE_COMPUTATIONAL_ZKSYNC_OS = 1n << 35n;
54
+ var L1_TX_NATIVE_PER_GAS = 100000000n;
55
+ var ZKSYNC_OS_PRIORITY_TX_TYPE = "0x7f";
56
+ var REGISTERED_TOKEN_BRIDGE_MINT_EXECUTION_GAS = 140000n;
57
+ var REGISTERED_TOKEN_BRIDGE_MINT_PUBDATA_BYTES = 300n;
50
58
 
51
59
  // src/core/utils/number.ts
52
60
  var isNumber = (x) => typeof x === "number" && Number.isFinite(x);
@@ -2700,13 +2708,6 @@ var IL2AssetRouterABI = [
2700
2708
  outputs: [{ name: "", type: "address", internalType: "address" }],
2701
2709
  stateMutability: "view"
2702
2710
  },
2703
- {
2704
- type: "function",
2705
- name: "l1TokenAddress",
2706
- inputs: [{ name: "_l2Token", type: "address", internalType: "address" }],
2707
- outputs: [{ name: "", type: "address", internalType: "address" }],
2708
- stateMutability: "view"
2709
- },
2710
2711
  {
2711
2712
  type: "function",
2712
2713
  name: "l2TokenAddress",
@@ -6160,7 +6161,7 @@ function toGasOverrides(overrides) {
6160
6161
 
6161
6162
  // src/adapters/ethers/resources/deposits/context.ts
6162
6163
  async function commonCtx(p, client, tokens, contracts) {
6163
- const { bridgehub, l1AssetRouter } = await contracts.addresses();
6164
+ const { bridgehub, l1AssetRouter, l1NativeTokenVault } = await contracts.addresses();
6164
6165
  const { chainId } = await client.l2.getNetwork();
6165
6166
  const sender = await client.signer.getAddress();
6166
6167
  const gasPerPubdata = p.gasPerPubdata ?? 800n;
@@ -6188,6 +6189,7 @@ async function commonCtx(p, client, tokens, contracts) {
6188
6189
  baseTokenL1,
6189
6190
  baseIsEth,
6190
6191
  l1AssetRouter,
6192
+ l1NativeTokenVault,
6191
6193
  route,
6192
6194
  bridgehub,
6193
6195
  chainIdL2: BigInt(chainId),
@@ -6213,9 +6215,6 @@ function encodeSecondBridgeArgs(token, amount, l2Receiver) {
6213
6215
  [token, amount, l2Receiver]
6214
6216
  );
6215
6217
  }
6216
- function encodeSecondBridgeErc20Args(token, amount, l2Receiver) {
6217
- return encodeSecondBridgeArgs(token, amount, l2Receiver);
6218
- }
6219
6218
  function encodeSecondBridgeEthArgs(amount, l2Receiver, ethToken = ETH_ADDRESS) {
6220
6219
  return encodeSecondBridgeArgs(ethToken, amount, l2Receiver);
6221
6220
  }
@@ -6425,6 +6424,15 @@ function ethersToGasEstimator(provider) {
6425
6424
  }
6426
6425
  return await provider.estimateGas(ethTx);
6427
6426
  },
6427
+ async estimatePriorityTxGas(tx) {
6428
+ if (!("send" in provider)) {
6429
+ throw new Error('Provider does not support "send"; cannot estimate priority tx gas.');
6430
+ }
6431
+ const result = await provider.send("eth_estimateGas", [
6432
+ { from: tx.from, to: tx.to, data: tx.data, type: ZKSYNC_OS_PRIORITY_TX_TYPE }
6433
+ ]);
6434
+ return BigInt(result);
6435
+ },
6428
6436
  async estimateFeesPerGas() {
6429
6437
  const fd = await provider.getFeeData();
6430
6438
  return {
@@ -6656,9 +6664,79 @@ async function quoteL2BaseCost2(input) {
6656
6664
  );
6657
6665
  }
6658
6666
 
6667
+ // src/core/resources/deposits/priority.ts
6668
+ var PRIORITY_TX_ENCODING_STEP_BYTES = 544n;
6669
+ var L1_TO_L2_ALIAS_OFFSET = 0x1111000000000000000000000000000000001111n;
6670
+ var DEFAULT_PRIORITY_BODY_GAS_ESTIMATE_MULTIPLIER = 7n;
6671
+ var PRIORITY_L2_GAS_BUFFER = 40n;
6672
+ var maxBigInt2 = (a, b) => a > b ? a : b;
6673
+ var ceilDiv = (a, b) => (a + b - 1n) / b;
6674
+ function applyL1ToL2Alias(address) {
6675
+ return `0x${(BigInt(address) + L1_TO_L2_ALIAS_OFFSET & (1n << 160n) - 1n).toString(16).padStart(40, "0")}`;
6676
+ }
6677
+ function derivePriorityTxGasBreakdown(input) {
6678
+ const factoryDepsCount = input.factoryDepsCount ?? 0n;
6679
+ const minBodyGas = maxBigInt2(
6680
+ L1_TX_INTRINSIC_L2_GAS + ceilDiv(
6681
+ input.encodedLength * L1_TX_DELTA_544_ENCODING_BYTES,
6682
+ PRIORITY_TX_ENCODING_STEP_BYTES
6683
+ ) + factoryDepsCount * L1_TX_DELTA_FACTORY_DEPS_L2_GAS,
6684
+ L1_TX_MIN_L2_GAS_BASE
6685
+ ) + L1_TX_INTRINSIC_PUBDATA * input.gasPerPubdata + factoryDepsCount * L1_TX_DELTA_FACTORY_DEPS_PUBDATA * input.gasPerPubdata;
6686
+ const overhead = maxBigInt2(TX_SLOT_OVERHEAD_L2_GAS, TX_MEMORY_OVERHEAD_GAS * input.encodedLength);
6687
+ const derivedBodyGas = minBodyGas;
6688
+ return {
6689
+ encodedLength: input.encodedLength,
6690
+ minBodyGas,
6691
+ overhead,
6692
+ derivedBodyGas,
6693
+ derivedL2GasLimit: derivedBodyGas + overhead,
6694
+ priorityTxMaxGasLimit: PRIORITY_TX_MAX_GAS_LIMIT,
6695
+ priorityTxMaxGasLimitExceeded: derivedBodyGas > PRIORITY_TX_MAX_GAS_LIMIT
6696
+ };
6697
+ }
6698
+ function derivePriorityBodyGasEstimateCap(input) {
6699
+ return input.minBodyGas * (input.multiplier ?? DEFAULT_PRIORITY_BODY_GAS_ESTIMATE_MULTIPLIER);
6700
+ }
6701
+ function applyPriorityL2GasLimitBuffer(input) {
6702
+ return input.gasLimit * (100n + PRIORITY_L2_GAS_BUFFER) / 100n;
6703
+ }
6704
+ function minimalPriorityTxL2Gas(input) {
6705
+ const intrinsic = L1_TX_INTRINSIC_L2_GAS_ZKSYNC_OS + L1_TX_CALLDATA_FLOOR_PRICE_L2_GAS_ZKSYNC_OS * input.calldataLength;
6706
+ const pubdata = L1_TX_INTRINSIC_PUBDATA_ZKSYNC_OS * input.gasPerPubdata + ceilDiv(MAX_NATIVE_COMPUTATIONAL_ZKSYNC_OS, L1_TX_NATIVE_PER_GAS);
6707
+ return maxBigInt2(intrinsic, pubdata);
6708
+ }
6709
+ function clampPriorityL2GasLimit(input) {
6710
+ return maxBigInt2(
6711
+ input.gasLimit,
6712
+ minimalPriorityTxL2Gas({
6713
+ calldataLength: BigInt(Math.max(input.l2Calldata.length - 2, 0) / 2),
6714
+ gasPerPubdata: input.gasPerPubdata
6715
+ })
6716
+ );
6717
+ }
6718
+ function resolveRegisteredTokenPriorityL2GasLimit(input) {
6719
+ if (input.nodeEstimate != null && input.nodeEstimate > 0n) {
6720
+ return maxBigInt2(input.priorityFloorGasLimit, applyGasBuffer(input.nodeEstimate));
6721
+ }
6722
+ const modeledGas = REGISTERED_TOKEN_BRIDGE_MINT_EXECUTION_GAS + REGISTERED_TOKEN_BRIDGE_MINT_PUBDATA_BYTES * input.gasPerPubdata;
6723
+ return maxBigInt2(
6724
+ input.priorityFloorGasLimit,
6725
+ applyPriorityL2GasLimitBuffer({ gasLimit: modeledGas })
6726
+ );
6727
+ }
6728
+
6659
6729
  // src/adapters/ethers/resources/deposits/services/gas.ts
6660
6730
  var DEFAULT_SAFE_NONBASE_L2_GAS_LIMIT = 3000000n;
6661
6731
  var ZERO_L2_TOKEN_ADDRESS = "0x0000000000000000000000000000000000000000";
6732
+ async function estimatePriorityTxL2Gas(ctx, leg) {
6733
+ if (!leg) return void 0;
6734
+ try {
6735
+ return await ethersToGasEstimator(ctx.client.l2).estimatePriorityTxGas?.(leg);
6736
+ } catch {
6737
+ return void 0;
6738
+ }
6739
+ }
6662
6740
  async function quoteL1Gas2(input) {
6663
6741
  const { ctx, tx, overrides, fallbackGasLimit } = input;
6664
6742
  const estimator = ethersToGasEstimator(ctx.client.l1);
@@ -6712,7 +6790,12 @@ async function determineNonBaseL2Gas(input) {
6712
6790
  return quoteL2Gas2({
6713
6791
  ctx,
6714
6792
  route,
6715
- overrideGasLimit: input.priorityFloorGasLimit
6793
+ overrideGasLimit: resolveRegisteredTokenPriorityL2GasLimit({
6794
+ chainIdL2: ctx.chainIdL2,
6795
+ priorityFloorGasLimit: input.priorityFloorGasLimit,
6796
+ gasPerPubdata: ctx.gasPerPubdata,
6797
+ nodeEstimate: await estimatePriorityTxL2Gas(ctx, input.priorityTxL2Leg)
6798
+ })
6716
6799
  });
6717
6800
  }
6718
6801
  const modelTx = {
@@ -6749,6 +6832,7 @@ async function determineEthNonBaseL2Gas(input) {
6749
6832
  knownL2Token: input.ctx.resolvedToken?.l2,
6750
6833
  modelTx: input.modelTx,
6751
6834
  priorityFloorGasLimit: input.priorityFloorGasLimit,
6835
+ priorityTxL2Leg: input.priorityTxL2Leg,
6752
6836
  undeployedGasLimit: input.undeployedGasLimit
6753
6837
  });
6754
6838
  }
@@ -6780,40 +6864,6 @@ function buildFeeBreakdown(p) {
6780
6864
  l2
6781
6865
  };
6782
6866
  }
6783
-
6784
- // src/core/resources/deposits/priority.ts
6785
- var PRIORITY_TX_ENCODING_STEP_BYTES = 544n;
6786
- var DEFAULT_PRIORITY_BODY_GAS_ESTIMATE_MULTIPLIER = 7n;
6787
- var PRIORITY_L2_GAS_BUFFER = 40n;
6788
- var maxBigInt2 = (a, b) => a > b ? a : b;
6789
- var ceilDiv = (a, b) => (a + b - 1n) / b;
6790
- function derivePriorityTxGasBreakdown(input) {
6791
- const factoryDepsCount = input.factoryDepsCount ?? 0n;
6792
- const minBodyGas = maxBigInt2(
6793
- L1_TX_INTRINSIC_L2_GAS + ceilDiv(
6794
- input.encodedLength * L1_TX_DELTA_544_ENCODING_BYTES,
6795
- PRIORITY_TX_ENCODING_STEP_BYTES
6796
- ) + factoryDepsCount * L1_TX_DELTA_FACTORY_DEPS_L2_GAS,
6797
- L1_TX_MIN_L2_GAS_BASE
6798
- ) + L1_TX_INTRINSIC_PUBDATA * input.gasPerPubdata + factoryDepsCount * L1_TX_DELTA_FACTORY_DEPS_PUBDATA * input.gasPerPubdata;
6799
- const overhead = maxBigInt2(TX_SLOT_OVERHEAD_L2_GAS, TX_MEMORY_OVERHEAD_GAS * input.encodedLength);
6800
- const derivedBodyGas = minBodyGas;
6801
- return {
6802
- encodedLength: input.encodedLength,
6803
- minBodyGas,
6804
- overhead,
6805
- derivedBodyGas,
6806
- derivedL2GasLimit: derivedBodyGas + overhead,
6807
- priorityTxMaxGasLimit: PRIORITY_TX_MAX_GAS_LIMIT,
6808
- priorityTxMaxGasLimitExceeded: derivedBodyGas > PRIORITY_TX_MAX_GAS_LIMIT
6809
- };
6810
- }
6811
- function derivePriorityBodyGasEstimateCap(input) {
6812
- return input.minBodyGas * (input.multiplier ?? DEFAULT_PRIORITY_BODY_GAS_ESTIMATE_MULTIPLIER);
6813
- }
6814
- function applyPriorityL2GasLimitBuffer(input) {
6815
- return input.gasLimit * (100n + PRIORITY_L2_GAS_BUFFER) / 100n;
6816
- }
6817
6867
  var EMPTY_BYTES = "0x";
6818
6868
  var ZERO_RESERVED_WORDS = [0n, 0n, 0n, 0n];
6819
6869
  var L2_CANONICAL_TRANSACTION_TUPLE = "tuple(uint256 txType,uint256 from,uint256 to,uint256 gasLimit,uint256 gasPerPubdataByteLimit,uint256 maxFeePerGas,uint256 maxPriorityFeePerGas,uint256 paymaster,uint256 nonce,uint256 value,uint256[4] reserved,bytes data,bytes signature,uint256[] factoryDeps,bytes paymasterInput,bytes reservedDynamic)";
@@ -6870,9 +6920,13 @@ function routeEthDirect() {
6870
6920
  l2Calldata,
6871
6921
  gasPerPubdata: ctx.gasPerPubdata
6872
6922
  });
6873
- const quotedL2GasLimit = ctx.l2GasLimit ?? applyPriorityL2GasLimitBuffer({
6874
- chainIdL2: ctx.chainIdL2,
6875
- gasLimit: priorityFloorBreakdown.derivedL2GasLimit
6923
+ const quotedL2GasLimit = ctx.l2GasLimit ?? clampPriorityL2GasLimit({
6924
+ gasLimit: applyPriorityL2GasLimitBuffer({
6925
+ chainIdL2: ctx.chainIdL2,
6926
+ gasLimit: priorityFloorBreakdown.derivedL2GasLimit
6927
+ }),
6928
+ l2Calldata,
6929
+ gasPerPubdata: ctx.gasPerPubdata
6876
6930
  });
6877
6931
  const l2GasParams = await quoteL2Gas2({
6878
6932
  ctx,
@@ -6962,26 +7016,18 @@ var ntvCodec = createNTVCodec({
6962
7016
  keccak256: (data) => ethers.keccak256(data)
6963
7017
  });
6964
7018
  async function encodeSecondBridgeErc20DepositCalldata(input) {
6965
- if (!input.ctx.resolvedToken) {
6966
- return encodeSecondBridgeErc20Args(input.token, input.amount, input.receiver);
6967
- }
6968
- const { chainId } = await input.ctx.client.l1.getNetwork();
6969
- const expectedL1AssetId = ntvCodec.encodeAssetId(
6970
- BigInt(chainId),
7019
+ const registeredAssetId = input.ctx.resolvedToken?.assetId;
7020
+ const assetId = registeredAssetId && registeredAssetId.toLowerCase() !== ZERO_ASSET_ID ? registeredAssetId : ntvCodec.encodeAssetId(
7021
+ BigInt((await input.ctx.client.l1.getNetwork()).chainId),
6971
7022
  L2_NATIVE_TOKEN_VAULT_ADDRESS,
6972
7023
  input.token
6973
7024
  );
6974
- const assetId = input.ctx.resolvedToken.assetId.toLowerCase();
6975
- const isL1Origin = assetId === ZERO_ASSET_ID || assetId === expectedL1AssetId.toLowerCase();
6976
- if (isL1Origin) {
6977
- return encodeSecondBridgeErc20Args(input.token, input.amount, input.receiver);
6978
- }
6979
7025
  const transferData = encodeNativeTokenVaultTransferData(
6980
7026
  input.amount,
6981
7027
  input.receiver,
6982
7028
  input.token
6983
7029
  );
6984
- return encodeSecondBridgeDataV1(input.ctx.resolvedToken.assetId, transferData);
7030
+ return encodeSecondBridgeDataV1(assetId, transferData);
6985
7031
  }
6986
7032
  async function getPriorityGasModel(input) {
6987
7033
  try {
@@ -7016,9 +7062,18 @@ async function getPriorityGasModel(input) {
7016
7062
  gasPerPubdata: input.ctx.gasPerPubdata
7017
7063
  });
7018
7064
  const model = {
7019
- priorityFloorGasLimit: applyPriorityL2GasLimitBuffer({
7020
- chainIdL2: input.ctx.chainIdL2,
7021
- gasLimit: priorityFloorBreakdown.derivedL2GasLimit
7065
+ priorityTxL2Leg: {
7066
+ from: applyL1ToL2Alias(input.ctx.l1AssetRouter),
7067
+ to: L2_ASSET_ROUTER_ADDRESS,
7068
+ data: l2Calldata
7069
+ },
7070
+ priorityFloorGasLimit: clampPriorityL2GasLimit({
7071
+ gasLimit: applyPriorityL2GasLimitBuffer({
7072
+ chainIdL2: input.ctx.chainIdL2,
7073
+ gasLimit: priorityFloorBreakdown.derivedL2GasLimit
7074
+ }),
7075
+ l2Calldata,
7076
+ gasPerPubdata: input.ctx.gasPerPubdata
7022
7077
  })
7023
7078
  };
7024
7079
  if (isFirstBridge || input.ctx.resolvedToken.l2.toLowerCase() === ZERO_L2_TOKEN_ADDRESS2) {
@@ -7076,6 +7131,7 @@ function routeErc20NonBase() {
7076
7131
  ctx,
7077
7132
  l1Token: p.token,
7078
7133
  priorityFloorGasLimit: priorityGasModel.priorityFloorGasLimit,
7134
+ priorityTxL2Leg: priorityGasModel.priorityTxL2Leg,
7079
7135
  undeployedGasLimit: priorityGasModel.undeployedGasLimit,
7080
7136
  modelTx: {
7081
7137
  to: receiver,
@@ -7090,25 +7146,29 @@ function routeErc20NonBase() {
7090
7146
  const approvals = [];
7091
7147
  const steps = [];
7092
7148
  const assetRouter = ctx.l1AssetRouter;
7149
+ const nativeTokenVault = ctx.l1NativeTokenVault;
7093
7150
  const erc20Deposit = new ethers.Contract(p.token, IERC20_default, l1Signer);
7094
7151
  const allowanceToken = await wrapAs2(
7095
7152
  "RPC",
7096
7153
  OP_DEPOSITS.nonbase.allowanceToken,
7097
- () => erc20Deposit.allowance(ctx.sender, assetRouter),
7154
+ () => erc20Deposit.allowance(ctx.sender, nativeTokenVault),
7098
7155
  {
7099
- ctx: { where: "erc20.allowance", token: p.token, spender: assetRouter },
7156
+ ctx: { where: "erc20.allowance", token: p.token, spender: nativeTokenVault },
7100
7157
  message: "Failed to read deposit-token allowance."
7101
7158
  }
7102
7159
  );
7103
7160
  if (allowanceToken < p.amount) {
7104
- approvals.push({ token: p.token, spender: assetRouter, amount: p.amount });
7161
+ approvals.push({ token: p.token, spender: nativeTokenVault, amount: p.amount });
7105
7162
  steps.push({
7106
- key: `approve:${p.token}:${assetRouter}`,
7163
+ key: `approve:${p.token}:${nativeTokenVault}`,
7107
7164
  kind: "approve",
7108
- description: `Approve ${p.amount} for router (deposit token)`,
7165
+ description: `Approve ${p.amount} for the native token vault (deposit token)`,
7109
7166
  tx: {
7110
7167
  to: p.token,
7111
- data: erc20Deposit.interface.encodeFunctionData("approve", [assetRouter, p.amount]),
7168
+ data: erc20Deposit.interface.encodeFunctionData("approve", [
7169
+ nativeTokenVault,
7170
+ p.amount
7171
+ ]),
7112
7172
  from: ctx.sender,
7113
7173
  ...ctx.gasOverrides
7114
7174
  }
@@ -7119,21 +7179,24 @@ function routeErc20NonBase() {
7119
7179
  const allowanceBase = await wrapAs2(
7120
7180
  "RPC",
7121
7181
  OP_DEPOSITS.nonbase.allowanceBase,
7122
- () => erc20Base.allowance(ctx.sender, assetRouter),
7182
+ () => erc20Base.allowance(ctx.sender, nativeTokenVault),
7123
7183
  {
7124
- ctx: { where: "erc20.allowance", token: baseToken, spender: assetRouter },
7184
+ ctx: { where: "erc20.allowance", token: baseToken, spender: nativeTokenVault },
7125
7185
  message: "Failed to read base-token allowance."
7126
7186
  }
7127
7187
  );
7128
7188
  if (allowanceBase < mintValue) {
7129
- approvals.push({ token: baseToken, spender: assetRouter, amount: mintValue });
7189
+ approvals.push({ token: baseToken, spender: nativeTokenVault, amount: mintValue });
7130
7190
  steps.push({
7131
- key: `approve:${baseToken}:${assetRouter}`,
7191
+ key: `approve:${baseToken}:${nativeTokenVault}`,
7132
7192
  kind: "approve",
7133
7193
  description: `Approve base token for mintValue`,
7134
7194
  tx: {
7135
7195
  to: baseToken,
7136
- data: erc20Base.interface.encodeFunctionData("approve", [assetRouter, mintValue]),
7196
+ data: erc20Base.interface.encodeFunctionData("approve", [
7197
+ nativeTokenVault,
7198
+ mintValue
7199
+ ]),
7137
7200
  from: ctx.sender,
7138
7201
  ...ctx.gasOverrides
7139
7202
  }
@@ -7230,9 +7293,18 @@ async function getPriorityGasModel2(input) {
7230
7293
  gasPerPubdata: input.ctx.gasPerPubdata
7231
7294
  });
7232
7295
  const model = {
7233
- priorityFloorGasLimit: applyPriorityL2GasLimitBuffer({
7234
- chainIdL2: input.ctx.chainIdL2,
7235
- gasLimit: priorityFloorBreakdown.derivedL2GasLimit
7296
+ priorityTxL2Leg: {
7297
+ from: applyL1ToL2Alias(input.ctx.l1AssetRouter),
7298
+ to: L2_ASSET_ROUTER_ADDRESS,
7299
+ data: l2Calldata
7300
+ },
7301
+ priorityFloorGasLimit: clampPriorityL2GasLimit({
7302
+ gasLimit: applyPriorityL2GasLimitBuffer({
7303
+ chainIdL2: input.ctx.chainIdL2,
7304
+ gasLimit: priorityFloorBreakdown.derivedL2GasLimit
7305
+ }),
7306
+ l2Calldata,
7307
+ gasPerPubdata: input.ctx.gasPerPubdata
7236
7308
  })
7237
7309
  };
7238
7310
  if (input.ctx.resolvedToken.l2.toLowerCase() === ZERO_L2_TOKEN_ADDRESS3) {
@@ -7309,6 +7381,7 @@ function routeEthNonBase() {
7309
7381
  ctx,
7310
7382
  modelTx: l2TxModel,
7311
7383
  priorityFloorGasLimit: priorityGasModel.priorityFloorGasLimit,
7384
+ priorityTxL2Leg: priorityGasModel.priorityTxL2Leg,
7312
7385
  undeployedGasLimit: priorityGasModel.undeployedGasLimit
7313
7386
  });
7314
7387
  if (!l2GasParams) throw new Error("Failed to estimate L2 gas parameters.");
@@ -7320,21 +7393,24 @@ function routeEthNonBase() {
7320
7393
  const allowance = await wrapAs3(
7321
7394
  "RPC",
7322
7395
  OP_DEPOSITS.ethNonBase.allowanceBase,
7323
- () => erc20Base.allowance(ctx.sender, ctx.l1AssetRouter),
7396
+ () => erc20Base.allowance(ctx.sender, ctx.l1NativeTokenVault),
7324
7397
  {
7325
- ctx: { where: "erc20.allowance", token: baseToken, spender: ctx.l1AssetRouter },
7398
+ ctx: { where: "erc20.allowance", token: baseToken, spender: ctx.l1NativeTokenVault },
7326
7399
  message: "Failed to read base-token allowance."
7327
7400
  }
7328
7401
  );
7329
7402
  if (allowance < mintValue) {
7330
- approvals.push({ token: baseToken, spender: ctx.l1AssetRouter, amount: mintValue });
7403
+ approvals.push({ token: baseToken, spender: ctx.l1NativeTokenVault, amount: mintValue });
7331
7404
  steps.push({
7332
- key: `approve:${baseToken}:${ctx.l1AssetRouter}`,
7405
+ key: `approve:${baseToken}:${ctx.l1NativeTokenVault}`,
7333
7406
  kind: "approve",
7334
7407
  description: `Approve base token for fees (mintValue)`,
7335
7408
  tx: {
7336
7409
  to: baseToken,
7337
- data: erc20Base.interface.encodeFunctionData("approve", [ctx.l1AssetRouter, mintValue]),
7410
+ data: erc20Base.interface.encodeFunctionData("approve", [
7411
+ ctx.l1NativeTokenVault,
7412
+ mintValue
7413
+ ]),
7338
7414
  from: ctx.sender,
7339
7415
  ...ctx.gasOverrides
7340
7416
  }
@@ -7450,9 +7526,13 @@ function routeErc20Base() {
7450
7526
  l2Calldata,
7451
7527
  gasPerPubdata: ctx.gasPerPubdata
7452
7528
  });
7453
- const quotedL2GasLimit = ctx.l2GasLimit ?? applyPriorityL2GasLimitBuffer({
7454
- chainIdL2: ctx.chainIdL2,
7455
- gasLimit: priorityFloorBreakdown.derivedL2GasLimit
7529
+ const quotedL2GasLimit = ctx.l2GasLimit ?? clampPriorityL2GasLimit({
7530
+ gasLimit: applyPriorityL2GasLimitBuffer({
7531
+ chainIdL2: ctx.chainIdL2,
7532
+ gasLimit: priorityFloorBreakdown.derivedL2GasLimit
7533
+ }),
7534
+ l2Calldata,
7535
+ gasPerPubdata: ctx.gasPerPubdata
7456
7536
  });
7457
7537
  const l2GasParams = await quoteL2Gas2({
7458
7538
  ctx,
@@ -7469,21 +7549,24 @@ function routeErc20Base() {
7469
7549
  const allowance = await wrapAs4(
7470
7550
  "RPC",
7471
7551
  OP_DEPOSITS.base.allowance,
7472
- () => erc20.allowance(ctx.sender, ctx.l1AssetRouter),
7552
+ () => erc20.allowance(ctx.sender, ctx.l1NativeTokenVault),
7473
7553
  {
7474
- ctx: { where: "erc20.allowance", token: baseToken, spender: ctx.l1AssetRouter },
7554
+ ctx: { where: "erc20.allowance", token: baseToken, spender: ctx.l1NativeTokenVault },
7475
7555
  message: "Failed to read base-token allowance."
7476
7556
  }
7477
7557
  );
7478
7558
  if (allowance < mintValue) {
7479
- approvals.push({ token: baseToken, spender: ctx.l1AssetRouter, amount: mintValue });
7559
+ approvals.push({ token: baseToken, spender: ctx.l1NativeTokenVault, amount: mintValue });
7480
7560
  steps.push({
7481
- key: `approve:${baseToken}:${ctx.l1AssetRouter}`,
7561
+ key: `approve:${baseToken}:${ctx.l1NativeTokenVault}`,
7482
7562
  kind: "approve",
7483
7563
  description: "Approve base token for mintValue",
7484
7564
  tx: {
7485
7565
  to: baseToken,
7486
- data: erc20.interface.encodeFunctionData("approve", [ctx.l1AssetRouter, mintValue]),
7566
+ data: erc20.interface.encodeFunctionData("approve", [
7567
+ ctx.l1NativeTokenVault,
7568
+ mintValue
7569
+ ]),
7487
7570
  from: ctx.sender,
7488
7571
  ...ctx.gasOverrides
7489
7572
  }
@@ -7617,8 +7700,17 @@ function createTokensResource(client) {
7617
7700
  const { chainId } = await client.l2.getNetwork();
7618
7701
  return await client.baseToken(BigInt(chainId));
7619
7702
  }
7620
- const { l2AssetRouter } = await client.contracts();
7621
- const l1Token = await l2AssetRouter.l1TokenAddress(l2Token);
7703
+ const { l2NativeTokenVault, l1NativeTokenVault } = await client.contracts();
7704
+ const assetId = await l2NativeTokenVault.assetId(l2Token);
7705
+ if (BigInt(assetId) === 0n) {
7706
+ throw new Error(`Token ${l2Token} is not registered in the L2 NativeTokenVault.`);
7707
+ }
7708
+ const l1Token = await l1NativeTokenVault.tokenAddress(assetId);
7709
+ if (BigInt(l1Token) === 0n) {
7710
+ throw new Error(
7711
+ `Token ${l2Token} has no L1 counterpart registered in the L1 NativeTokenVault.`
7712
+ );
7713
+ }
7622
7714
  return l1Token;
7623
7715
  });
7624
7716
  }