@matterlabs/zksync-js 0.0.24 → 0.0.26

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.
@@ -7840,7 +7840,7 @@ function createErrorOps(decodeRevert2) {
7840
7840
  function wrap8(operation, fn, opts) {
7841
7841
  return run("INTERNAL", operation, fn, opts);
7842
7842
  }
7843
- function wrapAs11(kind, operation, fn, opts) {
7843
+ function wrapAs12(kind, operation, fn, opts) {
7844
7844
  return run(kind, operation, fn, opts);
7845
7845
  }
7846
7846
  async function toResult3(operation, fn, opts) {
@@ -7861,7 +7861,7 @@ function createErrorOps(decodeRevert2) {
7861
7861
  return { ok: false, error: shaped };
7862
7862
  }
7863
7863
  }
7864
- return { wrap: wrap8, wrapAs: wrapAs11, toResult: toResult3 };
7864
+ return { wrap: wrap8, wrapAs: wrapAs12, toResult: toResult3 };
7865
7865
  }
7866
7866
  return { toZKsyncError: toZKsyncError2, createErrorHandlers: createErrorHandlers2 };
7867
7867
  }
@@ -8379,6 +8379,7 @@ function isEraVmChain(chainIdL2) {
8379
8379
 
8380
8380
  // src/core/resources/deposits/gas.ts
8381
8381
  var CREATE_REESTIMATE_BUFFER = 15n;
8382
+ var ZERO_FEES = { maxFeePerGas: 0n, maxPriorityFeePerGas: 0n };
8382
8383
  var maxBigInt = (a, b) => a > b ? a : b;
8383
8384
  function applyGasBuffer(gasLimit, bufferPct = BUFFER) {
8384
8385
  return gasLimit * (100n + bufferPct) / 100n;
@@ -8429,15 +8430,39 @@ async function fetchFees(estimator) {
8429
8430
  const gp = await estimator.getGasPrice();
8430
8431
  return { maxFeePerGas: gp, maxPriorityFeePerGas: 0n };
8431
8432
  } catch {
8432
- return { maxFeePerGas: 0n, maxPriorityFeePerGas: 0n };
8433
+ return void 0;
8434
+ }
8435
+ }
8436
+ async function quoteL1Fees(input) {
8437
+ const { estimator, overrides } = input;
8438
+ const maxFeeOverride = overrides?.maxFeePerGas;
8439
+ const tipOverride = overrides?.maxPriorityFeePerGas;
8440
+ if (maxFeeOverride != null && tipOverride != null) {
8441
+ return { maxFeePerGas: maxFeeOverride, maxPriorityFeePerGas: tipOverride };
8442
+ }
8443
+ const market = await fetchFees(estimator);
8444
+ if (maxFeeOverride != null) {
8445
+ const tip = market?.maxPriorityFeePerGas ?? 0n;
8446
+ return {
8447
+ maxFeePerGas: maxFeeOverride,
8448
+ maxPriorityFeePerGas: tip < maxFeeOverride ? tip : maxFeeOverride
8449
+ };
8450
+ }
8451
+ if (market == null) {
8452
+ throw new Error("Could not fetch L1 gas price for Bridgehub base cost calculation.");
8453
+ }
8454
+ if (tipOverride != null) {
8455
+ const headroom = market.maxFeePerGas > market.maxPriorityFeePerGas ? market.maxFeePerGas - market.maxPriorityFeePerGas : 0n;
8456
+ return { maxFeePerGas: headroom + tipOverride, maxPriorityFeePerGas: tipOverride };
8433
8457
  }
8458
+ return market;
8434
8459
  }
8435
8460
  async function quoteL1Gas(input) {
8436
8461
  const { estimator, tx, overrides, fallbackGasLimit } = input;
8437
8462
  let market;
8438
8463
  const getMarket = async () => {
8439
8464
  if (market) return market;
8440
- market = await fetchFees(estimator);
8465
+ market = await fetchFees(estimator) ?? ZERO_FEES;
8441
8466
  return market;
8442
8467
  };
8443
8468
  const maxFeePerGas = overrides?.maxFeePerGas ?? (tx.maxFeePerGas != null ? BigInt(tx.maxFeePerGas) : (await getMarket()).maxFeePerGas);
@@ -8459,7 +8484,7 @@ async function quoteL1Gas(input) {
8459
8484
  }
8460
8485
  async function quoteL2Gas(input) {
8461
8486
  const { estimator, route, tx, gasPerPubdata, l2GasLimit, overrideGasLimit, stateOverrides } = input;
8462
- const market = await fetchFees(estimator);
8487
+ const market = await fetchFees(estimator) ?? ZERO_FEES;
8463
8488
  const maxFeePerGas = market.maxFeePerGas || market.maxPriorityFeePerGas || 0n;
8464
8489
  const txGasLimit = tx?.gasLimit != null ? BigInt(tx.gasLimit) : void 0;
8465
8490
  const explicit = overrideGasLimit ?? txGasLimit;
@@ -8500,12 +8525,7 @@ async function quoteL2Gas(input) {
8500
8525
  }
8501
8526
  }
8502
8527
  async function quoteL2BaseCost(input) {
8503
- const { estimator, encode: encode2, bridgehub, chainIdL2, l2GasLimit, gasPerPubdata } = input;
8504
- const market = await fetchFees(estimator);
8505
- const l1GasPrice = market.maxFeePerGas || market.maxPriorityFeePerGas || 0n;
8506
- if (l1GasPrice === 0n) {
8507
- throw new Error("Could not fetch L1 gas price for Bridgehub base cost calculation.");
8508
- }
8528
+ const { estimator, encode: encode2, bridgehub, chainIdL2, l2GasLimit, gasPerPubdata, l1GasPrice } = input;
8509
8529
  const data = encode2(IBridgehub_default, "l2TransactionBaseCost", [
8510
8530
  chainIdL2,
8511
8531
  l1GasPrice,
@@ -8518,8 +8538,6 @@ async function quoteL2BaseCost(input) {
8518
8538
  });
8519
8539
  return BigInt(raw);
8520
8540
  }
8521
-
8522
- // src/adapters/ethers/estimator.ts
8523
8541
  function toCoreTx(tx) {
8524
8542
  return {
8525
8543
  to: tx.to,
@@ -8527,8 +8545,9 @@ function toCoreTx(tx) {
8527
8545
  data: tx.data,
8528
8546
  value: tx.value ? BigInt(tx.value) : void 0,
8529
8547
  gasLimit: tx.gasLimit ? BigInt(tx.gasLimit) : void 0,
8530
- maxFeePerGas: tx.maxFeePerGas ? BigInt(tx.maxFeePerGas) : void 0,
8531
- maxPriorityFeePerGas: tx.maxPriorityFeePerGas ? BigInt(tx.maxPriorityFeePerGas) : void 0
8548
+ // zero fees are explicit on zero-base-fee chains; dropping them would re-fetch the market tip
8549
+ maxFeePerGas: tx.maxFeePerGas != null ? BigInt(tx.maxFeePerGas) : void 0,
8550
+ maxPriorityFeePerGas: tx.maxPriorityFeePerGas != null ? BigInt(tx.maxPriorityFeePerGas) : void 0
8532
8551
  };
8533
8552
  }
8534
8553
  function ethersToGasEstimator(provider) {
@@ -8568,7 +8587,13 @@ function ethersToGasEstimator(provider) {
8568
8587
  throw new Error('Provider does not support "send"; cannot estimate priority tx gas.');
8569
8588
  }
8570
8589
  const result = await provider.send("eth_estimateGas", [
8571
- { from: tx.from, to: tx.to, data: tx.data, type: ZKSYNC_OS_PRIORITY_TX_TYPE }
8590
+ {
8591
+ from: tx.from,
8592
+ to: tx.to,
8593
+ data: tx.data,
8594
+ ...tx.value != null ? { value: ethers.toQuantity(tx.value) } : {},
8595
+ type: ZKSYNC_OS_PRIORITY_TX_TYPE
8596
+ }
8572
8597
  ]);
8573
8598
  return BigInt(result);
8574
8599
  },
@@ -8603,7 +8628,7 @@ var encode = (abi2, fn, args) => {
8603
8628
  return new ethers.Interface(abi2).encodeFunctionData(fn, args);
8604
8629
  };
8605
8630
  async function quoteL2BaseCost2(input) {
8606
- const { ctx, l2GasLimit } = input;
8631
+ const { ctx, l2GasLimit, l1GasPrice } = input;
8607
8632
  const estimator = ethersToGasEstimator(ctx.client.l1);
8608
8633
  return wrapAs2(
8609
8634
  "RPC",
@@ -8614,17 +8639,36 @@ async function quoteL2BaseCost2(input) {
8614
8639
  bridgehub: ctx.bridgehub,
8615
8640
  chainIdL2: ctx.chainIdL2,
8616
8641
  l2GasLimit,
8617
- gasPerPubdata: ctx.gasPerPubdata
8642
+ gasPerPubdata: ctx.gasPerPubdata,
8643
+ l1GasPrice
8618
8644
  }),
8619
8645
  { ctx: { chainIdL2: ctx.chainIdL2 } }
8620
8646
  );
8621
8647
  }
8622
8648
 
8623
8649
  // src/core/resources/deposits/priority.ts
8650
+ var ZK_CHAIN_PRICING_GETTERS_ABI = [
8651
+ {
8652
+ type: "function",
8653
+ name: "getZKsyncOS",
8654
+ stateMutability: "view",
8655
+ inputs: [],
8656
+ outputs: [{ name: "", type: "bool" }]
8657
+ },
8658
+ {
8659
+ type: "function",
8660
+ name: "getPubdataPricingMode",
8661
+ stateMutability: "view",
8662
+ inputs: [],
8663
+ outputs: [{ name: "", type: "uint8" }]
8664
+ }
8665
+ ];
8666
+ var PUBDATA_PRICING_MODE_ROLLUP = 0;
8624
8667
  var PRIORITY_TX_ENCODING_STEP_BYTES = 544n;
8625
8668
  var L1_TO_L2_ALIAS_OFFSET = 0x1111000000000000000000000000000000001111n;
8626
8669
  var DEFAULT_PRIORITY_BODY_GAS_ESTIMATE_MULTIPLIER = 7n;
8627
8670
  var PRIORITY_L2_GAS_BUFFER = 40n;
8671
+ var BASE_TOKEN_DEPOSIT_NEW_ACCOUNTS_PUBDATA_BYTES = 590n;
8628
8672
  var maxBigInt2 = (a, b) => a > b ? a : b;
8629
8673
  var ceilDiv = (a, b) => (a + b - 1n) / b;
8630
8674
  function applyL1ToL2Alias(address) {
@@ -8671,6 +8715,16 @@ function clampPriorityL2GasLimit(input) {
8671
8715
  })
8672
8716
  );
8673
8717
  }
8718
+ function resolveBaseTokenPriorityL2GasLimit(input) {
8719
+ if (input.nodeEstimate != null && input.nodeEstimate > 0n) {
8720
+ return maxBigInt2(input.priorityFloorGasLimit, applyGasBuffer(input.nodeEstimate));
8721
+ }
8722
+ if (!input.chargesPubdata) return input.priorityFloorGasLimit;
8723
+ return maxBigInt2(
8724
+ input.priorityFloorGasLimit,
8725
+ applyGasBuffer(BASE_TOKEN_DEPOSIT_NEW_ACCOUNTS_PUBDATA_BYTES * input.gasPerPubdata)
8726
+ );
8727
+ }
8674
8728
  function resolveRegisteredTokenPriorityL2GasLimit(input) {
8675
8729
  if (input.nodeEstimate != null && input.nodeEstimate > 0n) {
8676
8730
  return maxBigInt2(input.priorityFloorGasLimit, applyGasBuffer(input.nodeEstimate));
@@ -8683,6 +8737,7 @@ function resolveRegisteredTokenPriorityL2GasLimit(input) {
8683
8737
  }
8684
8738
 
8685
8739
  // src/adapters/ethers/resources/deposits/services/gas.ts
8740
+ var { wrapAs: wrapAs3 } = createErrorHandlers("deposits");
8686
8741
  var DEFAULT_SAFE_NONBASE_L2_GAS_LIMIT = 3000000n;
8687
8742
  var ZERO_L2_TOKEN_ADDRESS = "0x0000000000000000000000000000000000000000";
8688
8743
  async function estimatePriorityTxL2Gas(ctx, leg) {
@@ -8693,6 +8748,51 @@ async function estimatePriorityTxL2Gas(ctx, leg) {
8693
8748
  return void 0;
8694
8749
  }
8695
8750
  }
8751
+ async function resolvePriorityTxL2Sender(ctx) {
8752
+ try {
8753
+ const code = await ctx.client.l1.getCode(ctx.sender);
8754
+ if (!code || code === "0x") return ctx.sender;
8755
+ } catch {
8756
+ }
8757
+ return applyL1ToL2Alias(ctx.sender);
8758
+ }
8759
+ var chainPricingCache = /* @__PURE__ */ new WeakMap();
8760
+ async function readChainPricing(ctx) {
8761
+ const cached = chainPricingCache.get(ctx.client)?.get(ctx.chainIdL2);
8762
+ if (cached) return cached;
8763
+ try {
8764
+ const bridgehub = new ethers.Contract(ctx.bridgehub, IBridgehub_default, ctx.client.l1);
8765
+ const zkChainAddress = await bridgehub.getZKChain(ctx.chainIdL2);
8766
+ const zkChain = new ethers.Contract(zkChainAddress, ZK_CHAIN_PRICING_GETTERS_ABI, ctx.client.l1);
8767
+ let zksyncOS;
8768
+ try {
8769
+ zksyncOS = await zkChain.getZKsyncOS();
8770
+ } catch (err) {
8771
+ if (!ethers.isError(err, "CALL_EXCEPTION")) throw err;
8772
+ zksyncOS = false;
8773
+ }
8774
+ const chargesPubdata = zksyncOS && Number(await zkChain.getPubdataPricingMode()) === PUBDATA_PRICING_MODE_ROLLUP;
8775
+ const pricing = { zksyncOS, chargesPubdata };
8776
+ const perClient = chainPricingCache.get(ctx.client) ?? /* @__PURE__ */ new Map();
8777
+ perClient.set(ctx.chainIdL2, pricing);
8778
+ chainPricingCache.set(ctx.client, perClient);
8779
+ return pricing;
8780
+ } catch {
8781
+ return void 0;
8782
+ }
8783
+ }
8784
+ async function quoteL1Fees2(input) {
8785
+ const { ctx } = input;
8786
+ return wrapAs3(
8787
+ "RPC",
8788
+ "deposits.fees.l1",
8789
+ () => quoteL1Fees({
8790
+ estimator: ethersToGasEstimator(ctx.client.l1),
8791
+ overrides: ctx.gasOverrides
8792
+ }),
8793
+ { ctx: { chainIdL2: ctx.chainIdL2 } }
8794
+ );
8795
+ }
8696
8796
  async function quoteL1Gas2(input) {
8697
8797
  const { ctx, tx, overrides, fallbackGasLimit } = input;
8698
8798
  const estimator = ethersToGasEstimator(ctx.client.l1);
@@ -8716,6 +8816,26 @@ async function quoteL2Gas2(input) {
8716
8816
  stateOverrides: input.stateOverrides
8717
8817
  });
8718
8818
  }
8819
+ async function determineBaseL2GasLimit(input) {
8820
+ const { ctx } = input;
8821
+ if (ctx.l2GasLimit != null) return ctx.l2GasLimit;
8822
+ const [pricing, from] = await Promise.all([
8823
+ readChainPricing(ctx),
8824
+ resolvePriorityTxL2Sender(ctx)
8825
+ ]);
8826
+ if (pricing && !pricing.zksyncOS) return input.priorityFloorGasLimit;
8827
+ return resolveBaseTokenPriorityL2GasLimit({
8828
+ priorityFloorGasLimit: input.priorityFloorGasLimit,
8829
+ gasPerPubdata: ctx.gasPerPubdata,
8830
+ chargesPubdata: pricing?.chargesPubdata ?? true,
8831
+ nodeEstimate: await estimatePriorityTxL2Gas(ctx, {
8832
+ from,
8833
+ to: input.l2Contract,
8834
+ data: input.l2Calldata,
8835
+ value: input.l2Value
8836
+ })
8837
+ });
8838
+ }
8719
8839
  async function determineNonBaseL2Gas(input) {
8720
8840
  const { ctx, l1Token, route } = input;
8721
8841
  const fallbackQuote = () => quoteL2Gas2({
@@ -8876,13 +8996,19 @@ function routeEthDirect() {
8876
8996
  l2Calldata,
8877
8997
  gasPerPubdata: ctx.gasPerPubdata
8878
8998
  });
8879
- const quotedL2GasLimit = ctx.l2GasLimit ?? clampPriorityL2GasLimit({
8880
- gasLimit: applyPriorityL2GasLimitBuffer({
8881
- chainIdL2: ctx.chainIdL2,
8882
- gasLimit: priorityFloorBreakdown.derivedL2GasLimit
8883
- }),
8999
+ const quotedL2GasLimit = await determineBaseL2GasLimit({
9000
+ ctx,
9001
+ l2Contract,
9002
+ l2Value,
8884
9003
  l2Calldata,
8885
- gasPerPubdata: ctx.gasPerPubdata
9004
+ priorityFloorGasLimit: clampPriorityL2GasLimit({
9005
+ gasLimit: applyPriorityL2GasLimitBuffer({
9006
+ chainIdL2: ctx.chainIdL2,
9007
+ gasLimit: priorityFloorBreakdown.derivedL2GasLimit
9008
+ }),
9009
+ l2Calldata,
9010
+ gasPerPubdata: ctx.gasPerPubdata
9011
+ })
8886
9012
  });
8887
9013
  const l2GasParams = await quoteL2Gas2({
8888
9014
  ctx,
@@ -8892,7 +9018,12 @@ function routeEthDirect() {
8892
9018
  if (!l2GasParams) {
8893
9019
  throw new Error("Failed to estimate L2 gas for deposit.");
8894
9020
  }
8895
- const baseCost = await quoteL2BaseCost2({ ctx, l2GasLimit: l2GasParams.gasLimit });
9021
+ const l1Fees = await quoteL1Fees2({ ctx });
9022
+ const baseCost = await quoteL2BaseCost2({
9023
+ ctx,
9024
+ l2GasLimit: l2GasParams.gasLimit,
9025
+ l1GasPrice: l1Fees.maxFeePerGas
9026
+ });
8896
9027
  const mintValue = baseCost + ctx.operatorTip + l2Value;
8897
9028
  const req = buildDirectRequestStruct({
8898
9029
  chainId: ctx.chainIdL2,
@@ -8909,7 +9040,8 @@ function routeEthDirect() {
8909
9040
  data,
8910
9041
  value: mintValue,
8911
9042
  from: ctx.sender,
8912
- ...ctx.gasOverrides
9043
+ ...ctx.gasOverrides,
9044
+ ...l1Fees
8913
9045
  };
8914
9046
  const l1GasParams = await quoteL1Gas2({
8915
9047
  ctx,
@@ -8961,7 +9093,7 @@ function createNTVCodec(deps) {
8961
9093
  }
8962
9094
 
8963
9095
  // src/adapters/ethers/resources/deposits/routes/erc20-nonbase.ts
8964
- var { wrapAs: wrapAs3 } = createErrorHandlers("deposits");
9096
+ var { wrapAs: wrapAs4 } = createErrorHandlers("deposits");
8965
9097
  var ZERO_L2_TOKEN_ADDRESS2 = "0x0000000000000000000000000000000000000000";
8966
9098
  var ZERO_ASSET_ID = "0x0000000000000000000000000000000000000000000000000000000000000000";
8967
9099
  var ntvCodec = createNTVCodec({
@@ -9044,7 +9176,7 @@ function routeErc20NonBase() {
9044
9176
  async preflight(p, ctx) {
9045
9177
  const resolved = ctx.resolvedToken ?? (ctx.tokens ? await ctx.tokens.resolve(p.token, { chain: "l1" }) : void 0);
9046
9178
  const baseToken = ctx.baseTokenL1 ?? await ctx.client.baseToken(ctx.chainIdL2);
9047
- await wrapAs3(
9179
+ await wrapAs4(
9048
9180
  "VALIDATION",
9049
9181
  OP_DEPOSITS.nonbase.assertNonBaseToken,
9050
9182
  () => {
@@ -9060,7 +9192,7 @@ function routeErc20NonBase() {
9060
9192
  const baseToken = ctx.baseTokenL1 ?? await ctx.client.baseToken(ctx.chainIdL2);
9061
9193
  const baseIsEth = ctx.baseIsEth ?? isETH(baseToken);
9062
9194
  const receiver = p.to ?? ctx.sender;
9063
- const secondBridgeCalldata = await wrapAs3(
9195
+ const secondBridgeCalldata = await wrapAs4(
9064
9196
  "INTERNAL",
9065
9197
  OP_DEPOSITS.nonbase.encodeCalldata,
9066
9198
  () => encodeSecondBridgeErc20DepositCalldata({
@@ -9094,14 +9226,19 @@ function routeErc20NonBase() {
9094
9226
  }
9095
9227
  });
9096
9228
  if (!l2GasParams) throw new Error("Failed to establish L2 gas parameters.");
9097
- const baseCost = await quoteL2BaseCost2({ ctx, l2GasLimit: l2GasParams.gasLimit });
9229
+ const l1Fees = await quoteL1Fees2({ ctx });
9230
+ const baseCost = await quoteL2BaseCost2({
9231
+ ctx,
9232
+ l2GasLimit: l2GasParams.gasLimit,
9233
+ l1GasPrice: l1Fees.maxFeePerGas
9234
+ });
9098
9235
  const mintValue = baseCost + ctx.operatorTip;
9099
9236
  const approvals = [];
9100
9237
  const steps = [];
9101
9238
  const assetRouter = ctx.l1AssetRouter;
9102
9239
  const nativeTokenVault = ctx.l1NativeTokenVault;
9103
9240
  const erc20Deposit = new ethers.Contract(p.token, IERC20_default, l1Signer);
9104
- const allowanceToken = await wrapAs3(
9241
+ const allowanceToken = await wrapAs4(
9105
9242
  "RPC",
9106
9243
  OP_DEPOSITS.nonbase.allowanceToken,
9107
9244
  () => erc20Deposit.allowance(ctx.sender, nativeTokenVault),
@@ -9129,7 +9266,7 @@ function routeErc20NonBase() {
9129
9266
  }
9130
9267
  if (!baseIsEth) {
9131
9268
  const erc20Base = new ethers.Contract(baseToken, IERC20_default, l1Signer);
9132
- const allowanceBase = await wrapAs3(
9269
+ const allowanceBase = await wrapAs4(
9133
9270
  "RPC",
9134
9271
  OP_DEPOSITS.nonbase.allowanceBase,
9135
9272
  () => erc20Base.allowance(ctx.sender, nativeTokenVault),
@@ -9177,7 +9314,8 @@ function routeErc20NonBase() {
9177
9314
  data,
9178
9315
  value: txValue,
9179
9316
  from: ctx.sender,
9180
- ...ctx.gasOverrides
9317
+ ...ctx.gasOverrides,
9318
+ ...l1Fees
9181
9319
  };
9182
9320
  const l1GasParams = await quoteL1Gas2({
9183
9321
  ctx,
@@ -9212,7 +9350,7 @@ function routeErc20NonBase() {
9212
9350
  }
9213
9351
  };
9214
9352
  }
9215
- var { wrapAs: wrapAs4 } = createErrorHandlers("deposits");
9353
+ var { wrapAs: wrapAs5 } = createErrorHandlers("deposits");
9216
9354
  var ZERO_L2_TOKEN_ADDRESS3 = "0x0000000000000000000000000000000000000000";
9217
9355
  var ZERO_ASSET_ID2 = "0x0000000000000000000000000000000000000000000000000000000000000000";
9218
9356
  var ntvCodec2 = createNTVCodec({
@@ -9288,7 +9426,7 @@ function routeEthNonBase() {
9288
9426
  return {
9289
9427
  async preflight(p, ctx) {
9290
9428
  const resolved = ctx.resolvedToken ?? (ctx.tokens ? await ctx.tokens.resolve(p.token, { chain: "l1" }) : void 0);
9291
- await wrapAs4(
9429
+ await wrapAs5(
9292
9430
  "VALIDATION",
9293
9431
  OP_DEPOSITS.ethNonBase.assertEthAsset,
9294
9432
  () => {
@@ -9298,7 +9436,7 @@ function routeEthNonBase() {
9298
9436
  },
9299
9437
  { ctx: { token: p.token } }
9300
9438
  );
9301
- await wrapAs4(
9439
+ await wrapAs5(
9302
9440
  "VALIDATION",
9303
9441
  OP_DEPOSITS.ethNonBase.assertNonEthBase,
9304
9442
  () => {
@@ -9308,7 +9446,7 @@ function routeEthNonBase() {
9308
9446
  },
9309
9447
  { ctx: { baseIsEth: ctx.baseIsEth, chainIdL2: ctx.chainIdL2 } }
9310
9448
  );
9311
- const ethBal = await wrapAs4(
9449
+ const ethBal = await wrapAs5(
9312
9450
  "RPC",
9313
9451
  OP_DEPOSITS.ethNonBase.ethBalance,
9314
9452
  () => ctx.client.l1.getBalance(ctx.sender),
@@ -9317,7 +9455,7 @@ function routeEthNonBase() {
9317
9455
  message: "Failed to read L1 ETH balance."
9318
9456
  }
9319
9457
  );
9320
- await wrapAs4(
9458
+ await wrapAs5(
9321
9459
  "VALIDATION",
9322
9460
  OP_DEPOSITS.ethNonBase.assertEthBalance,
9323
9461
  () => {
@@ -9352,12 +9490,17 @@ function routeEthNonBase() {
9352
9490
  undeployedGasLimit: priorityGasModel.undeployedGasLimit
9353
9491
  });
9354
9492
  if (!l2GasParams) throw new Error("Failed to estimate L2 gas parameters.");
9355
- const baseCost = await quoteL2BaseCost2({ ctx, l2GasLimit: l2GasParams.gasLimit });
9493
+ const l1Fees = await quoteL1Fees2({ ctx });
9494
+ const baseCost = await quoteL2BaseCost2({
9495
+ ctx,
9496
+ l2GasLimit: l2GasParams.gasLimit,
9497
+ l1GasPrice: l1Fees.maxFeePerGas
9498
+ });
9356
9499
  const mintValue = baseCost + ctx.operatorTip;
9357
9500
  const approvals = [];
9358
9501
  const steps = [];
9359
9502
  const erc20Base = new ethers.Contract(baseToken, IERC20_default, l1Signer);
9360
- const allowance = await wrapAs4(
9503
+ const allowance = await wrapAs5(
9361
9504
  "RPC",
9362
9505
  OP_DEPOSITS.ethNonBase.allowanceBase,
9363
9506
  () => erc20Base.allowance(ctx.sender, ctx.l1NativeTokenVault),
@@ -9383,7 +9526,7 @@ function routeEthNonBase() {
9383
9526
  }
9384
9527
  });
9385
9528
  }
9386
- const secondBridgeCalldata = await wrapAs4(
9529
+ const secondBridgeCalldata = await wrapAs5(
9387
9530
  "INTERNAL",
9388
9531
  OP_DEPOSITS.ethNonBase.encodeCalldata,
9389
9532
  () => encodeSecondBridgeEthDepositCalldata({ ctx, amount: p.amount, receiver }),
@@ -9416,7 +9559,8 @@ function routeEthNonBase() {
9416
9559
  data,
9417
9560
  value: bridgehubValue,
9418
9561
  from: ctx.sender,
9419
- ...ctx.gasOverrides
9562
+ ...ctx.gasOverrides,
9563
+ ...l1Fees
9420
9564
  };
9421
9565
  const l1GasParams = await quoteL1Gas2({
9422
9566
  ctx,
@@ -9451,13 +9595,13 @@ function routeEthNonBase() {
9451
9595
  }
9452
9596
  };
9453
9597
  }
9454
- var { wrapAs: wrapAs5 } = createErrorHandlers("deposits");
9598
+ var { wrapAs: wrapAs6 } = createErrorHandlers("deposits");
9455
9599
  var EMPTY_BYTES3 = "0x";
9456
9600
  function routeErc20Base() {
9457
9601
  return {
9458
9602
  async preflight(p, ctx) {
9459
9603
  const resolved = ctx.resolvedToken ?? (ctx.tokens ? await ctx.tokens.resolve(p.token, { chain: "l1" }) : void 0);
9460
- await wrapAs5(
9604
+ await wrapAs6(
9461
9605
  "VALIDATION",
9462
9606
  OP_DEPOSITS.base.assertErc20Asset,
9463
9607
  () => {
@@ -9468,7 +9612,7 @@ function routeErc20Base() {
9468
9612
  { ctx: { token: p.token } }
9469
9613
  );
9470
9614
  const baseToken = ctx.baseTokenL1 ?? await ctx.client.baseToken(ctx.chainIdL2);
9471
- await wrapAs5(
9615
+ await wrapAs6(
9472
9616
  "VALIDATION",
9473
9617
  OP_DEPOSITS.base.assertMatchesBase,
9474
9618
  () => {
@@ -9493,13 +9637,19 @@ function routeErc20Base() {
9493
9637
  l2Calldata,
9494
9638
  gasPerPubdata: ctx.gasPerPubdata
9495
9639
  });
9496
- const quotedL2GasLimit = ctx.l2GasLimit ?? clampPriorityL2GasLimit({
9497
- gasLimit: applyPriorityL2GasLimitBuffer({
9498
- chainIdL2: ctx.chainIdL2,
9499
- gasLimit: priorityFloorBreakdown.derivedL2GasLimit
9500
- }),
9640
+ const quotedL2GasLimit = await determineBaseL2GasLimit({
9641
+ ctx,
9642
+ l2Contract,
9643
+ l2Value,
9501
9644
  l2Calldata,
9502
- gasPerPubdata: ctx.gasPerPubdata
9645
+ priorityFloorGasLimit: clampPriorityL2GasLimit({
9646
+ gasLimit: applyPriorityL2GasLimitBuffer({
9647
+ chainIdL2: ctx.chainIdL2,
9648
+ gasLimit: priorityFloorBreakdown.derivedL2GasLimit
9649
+ }),
9650
+ l2Calldata,
9651
+ gasPerPubdata: ctx.gasPerPubdata
9652
+ })
9503
9653
  });
9504
9654
  const l2GasParams = await quoteL2Gas2({
9505
9655
  ctx,
@@ -9507,13 +9657,18 @@ function routeErc20Base() {
9507
9657
  overrideGasLimit: quotedL2GasLimit
9508
9658
  });
9509
9659
  if (!l2GasParams) throw new Error("Failed to estimate L2 gas parameters.");
9510
- const baseCost = await quoteL2BaseCost2({ ctx, l2GasLimit: l2GasParams.gasLimit });
9660
+ const l1Fees = await quoteL1Fees2({ ctx });
9661
+ const baseCost = await quoteL2BaseCost2({
9662
+ ctx,
9663
+ l2GasLimit: l2GasParams.gasLimit,
9664
+ l1GasPrice: l1Fees.maxFeePerGas
9665
+ });
9511
9666
  const mintValue = baseCost + ctx.operatorTip + p.amount;
9512
9667
  const approvals = [];
9513
9668
  const steps = [];
9514
9669
  {
9515
9670
  const erc20 = new ethers.Contract(baseToken, IERC20_default, l1Signer);
9516
- const allowance = await wrapAs5(
9671
+ const allowance = await wrapAs6(
9517
9672
  "RPC",
9518
9673
  OP_DEPOSITS.base.allowance,
9519
9674
  () => erc20.allowance(ctx.sender, ctx.l1NativeTokenVault),
@@ -9559,7 +9714,8 @@ function routeErc20Base() {
9559
9714
  value: 0n,
9560
9715
  // base token is ERC-20 ⇒ msg.value MUST be 0
9561
9716
  from: ctx.sender,
9562
- ...ctx.gasOverrides
9717
+ ...ctx.gasOverrides,
9718
+ ...l1Fees
9563
9719
  };
9564
9720
  const l1GasParams = await quoteL1Gas2({
9565
9721
  ctx,
@@ -9594,7 +9750,7 @@ function routeErc20Base() {
9594
9750
  }
9595
9751
  };
9596
9752
  }
9597
- var { wrapAs: wrapAs6 } = createErrorHandlers("tokens");
9753
+ var { wrapAs: wrapAs7 } = createErrorHandlers("tokens");
9598
9754
  var abi = ethers.AbiCoder.defaultAbiCoder();
9599
9755
  var ntvCodec3 = createNTVCodec({
9600
9756
  encode: (types, values) => abi.encode(types, values),
@@ -9607,7 +9763,7 @@ function createTokensResource(client) {
9607
9763
  let wethL2Promise = null;
9608
9764
  async function getL1ChainId() {
9609
9765
  if (!l2NtvL1ChainIdPromise) {
9610
- l2NtvL1ChainIdPromise = wrapAs6("INTERNAL", "getL1ChainId", async () => {
9766
+ l2NtvL1ChainIdPromise = wrapAs7("INTERNAL", "getL1ChainId", async () => {
9611
9767
  const { l2NativeTokenVault } = await client.contracts();
9612
9768
  const chainId = await l2NativeTokenVault.L1_CHAIN_ID();
9613
9769
  return chainId;
@@ -9617,7 +9773,7 @@ function createTokensResource(client) {
9617
9773
  }
9618
9774
  async function getBaseTokenAssetId() {
9619
9775
  if (!baseTokenAssetIdPromise) {
9620
- baseTokenAssetIdPromise = wrapAs6("INTERNAL", "baseTokenAssetId", async () => {
9776
+ baseTokenAssetIdPromise = wrapAs7("INTERNAL", "baseTokenAssetId", async () => {
9621
9777
  const { l2NativeTokenVault } = await client.contracts();
9622
9778
  const assetId = await l2NativeTokenVault.BASE_TOKEN_ASSET_ID();
9623
9779
  return assetId;
@@ -9627,7 +9783,7 @@ function createTokensResource(client) {
9627
9783
  }
9628
9784
  async function getWethL1() {
9629
9785
  if (!wethL1Promise) {
9630
- wethL1Promise = wrapAs6("INTERNAL", "wethL1", async () => {
9786
+ wethL1Promise = wrapAs7("INTERNAL", "wethL1", async () => {
9631
9787
  const { l1NativeTokenVault } = await client.contracts();
9632
9788
  const weth = await l1NativeTokenVault.WETH_TOKEN();
9633
9789
  return weth;
@@ -9637,7 +9793,7 @@ function createTokensResource(client) {
9637
9793
  }
9638
9794
  async function getWethL2() {
9639
9795
  if (!wethL2Promise) {
9640
- wethL2Promise = wrapAs6("INTERNAL", "wethL2", async () => {
9796
+ wethL2Promise = wrapAs7("INTERNAL", "wethL2", async () => {
9641
9797
  const { l2NativeTokenVault } = await client.contracts();
9642
9798
  const weth = await l2NativeTokenVault.WETH_TOKEN();
9643
9799
  return weth;
@@ -9646,7 +9802,7 @@ function createTokensResource(client) {
9646
9802
  return wethL2Promise;
9647
9803
  }
9648
9804
  async function toL2Address(l1Token) {
9649
- return wrapAs6("CONTRACT", "tokens.toL2Address", async () => {
9805
+ return wrapAs7("CONTRACT", "tokens.toL2Address", async () => {
9650
9806
  const normalized = normalizeL1Token(l1Token);
9651
9807
  const { chainId } = await client.l2.getNetwork();
9652
9808
  const baseToken = await client.baseToken(BigInt(chainId));
@@ -9659,7 +9815,7 @@ function createTokensResource(client) {
9659
9815
  });
9660
9816
  }
9661
9817
  async function toL1Address(l2Token) {
9662
- return wrapAs6("CONTRACT", "tokens.toL1Address", async () => {
9818
+ return wrapAs7("CONTRACT", "tokens.toL1Address", async () => {
9663
9819
  if (isAddressEq(l2Token, ETH_ADDRESS)) {
9664
9820
  return ETH_ADDRESS;
9665
9821
  }
@@ -9682,7 +9838,7 @@ function createTokensResource(client) {
9682
9838
  });
9683
9839
  }
9684
9840
  async function assetIdOfL1(l1Token) {
9685
- return wrapAs6("CONTRACT", "tokens.assetIdOfL1", async () => {
9841
+ return wrapAs7("CONTRACT", "tokens.assetIdOfL1", async () => {
9686
9842
  const normalized = normalizeL1Token(l1Token);
9687
9843
  const { l1NativeTokenVault } = await client.contracts();
9688
9844
  const assetId = await l1NativeTokenVault.assetId(normalized);
@@ -9690,28 +9846,28 @@ function createTokensResource(client) {
9690
9846
  });
9691
9847
  }
9692
9848
  async function assetIdOfL2(l2Token) {
9693
- return wrapAs6("CONTRACT", "tokens.assetIdOfL2", async () => {
9849
+ return wrapAs7("CONTRACT", "tokens.assetIdOfL2", async () => {
9694
9850
  const { l2NativeTokenVault } = await client.contracts();
9695
9851
  const assetId = await l2NativeTokenVault.assetId(l2Token);
9696
9852
  return assetId;
9697
9853
  });
9698
9854
  }
9699
9855
  async function l2TokenFromAssetId(assetId) {
9700
- return wrapAs6("CONTRACT", "tokens.l2TokenFromAssetId", async () => {
9856
+ return wrapAs7("CONTRACT", "tokens.l2TokenFromAssetId", async () => {
9701
9857
  const { l2NativeTokenVault } = await client.contracts();
9702
9858
  const tokenAddr = await l2NativeTokenVault.tokenAddress(assetId);
9703
9859
  return tokenAddr;
9704
9860
  });
9705
9861
  }
9706
9862
  async function l1TokenFromAssetId(assetId) {
9707
- return wrapAs6("CONTRACT", "tokens.l1TokenFromAssetId", async () => {
9863
+ return wrapAs7("CONTRACT", "tokens.l1TokenFromAssetId", async () => {
9708
9864
  const { l1NativeTokenVault } = await client.contracts();
9709
9865
  const tokenAddr = await l1NativeTokenVault.tokenAddress(assetId);
9710
9866
  return tokenAddr;
9711
9867
  });
9712
9868
  }
9713
9869
  async function originChainId(assetId) {
9714
- return wrapAs6("CONTRACT", "tokens.originChainId", async () => {
9870
+ return wrapAs7("CONTRACT", "tokens.originChainId", async () => {
9715
9871
  const { l2NativeTokenVault } = await client.contracts();
9716
9872
  const chainId = await l2NativeTokenVault.originChainId(assetId);
9717
9873
  return chainId;
@@ -9721,7 +9877,7 @@ function createTokensResource(client) {
9721
9877
  return getBaseTokenAssetId();
9722
9878
  }
9723
9879
  async function isChainEthBased() {
9724
- return wrapAs6("CONTRACT", "tokens.isChainEthBased", async () => {
9880
+ return wrapAs7("CONTRACT", "tokens.isChainEthBased", async () => {
9725
9881
  const baseAssetId = await getBaseTokenAssetId();
9726
9882
  const l1ChainId = await getL1ChainId();
9727
9883
  const ethAssetId = ntvCodec3.encodeAssetId(
@@ -9739,7 +9895,7 @@ function createTokensResource(client) {
9739
9895
  return getWethL2();
9740
9896
  }
9741
9897
  async function computeL2BridgedAddress(args) {
9742
- return wrapAs6("CONTRACT", "tokens.computeL2BridgedAddress", async () => {
9898
+ return wrapAs7("CONTRACT", "tokens.computeL2BridgedAddress", async () => {
9743
9899
  const normalized = normalizeL1Token(args.l1Token);
9744
9900
  const { l2NativeTokenVault } = await client.contracts();
9745
9901
  const predicted = await l2NativeTokenVault.calculateCreate2TokenAddress(
@@ -9750,7 +9906,7 @@ function createTokensResource(client) {
9750
9906
  });
9751
9907
  }
9752
9908
  async function resolve(ref, opts) {
9753
- return wrapAs6("CONTRACT", "tokens.resolve", async () => {
9909
+ return wrapAs7("CONTRACT", "tokens.resolve", async () => {
9754
9910
  let chain;
9755
9911
  let address;
9756
9912
  if (typeof ref === "string") {
@@ -10317,13 +10473,13 @@ function buildFeeBreakdown2(p) {
10317
10473
  }
10318
10474
 
10319
10475
  // src/adapters/ethers/resources/withdrawals/routes/eth.ts
10320
- var { wrapAs: wrapAs7 } = createErrorHandlers("withdrawals");
10476
+ var { wrapAs: wrapAs8 } = createErrorHandlers("withdrawals");
10321
10477
  function routeEthBase() {
10322
10478
  return {
10323
10479
  async build(p, ctx) {
10324
10480
  const steps = [];
10325
10481
  const base = await ctx.contracts.l2BaseTokenSystem();
10326
- const data = await wrapAs7(
10482
+ const data = await wrapAs8(
10327
10483
  "INTERNAL",
10328
10484
  OP_WITHDRAWALS.eth.encodeWithdraw,
10329
10485
  () => Promise.resolve(base.interface.encodeFunctionData("withdraw", [p.to ?? ctx.sender])),
@@ -10358,7 +10514,7 @@ function routeEthBase() {
10358
10514
  }
10359
10515
  };
10360
10516
  }
10361
- var { wrapAs: wrapAs8 } = createErrorHandlers("withdrawals");
10517
+ var { wrapAs: wrapAs9 } = createErrorHandlers("withdrawals");
10362
10518
  var SIG = {
10363
10519
  withdraw: "withdraw(bytes32,bytes)"
10364
10520
  };
@@ -10368,7 +10524,7 @@ function routeErc20NonBase2() {
10368
10524
  const steps = [];
10369
10525
  const approvals = [];
10370
10526
  const erc20 = new ethers.Contract(p.token, IERC20_default, ctx.client.l2);
10371
- const current = await wrapAs8(
10527
+ const current = await wrapAs9(
10372
10528
  "CONTRACT",
10373
10529
  OP_WITHDRAWALS.erc20.allowance,
10374
10530
  () => erc20.allowance(ctx.sender, ctx.l2NativeTokenVault),
@@ -10406,7 +10562,7 @@ function routeErc20NonBase2() {
10406
10562
  tx: approveTx
10407
10563
  });
10408
10564
  }
10409
- const assetId = await wrapAs8(
10565
+ const assetId = await wrapAs9(
10410
10566
  "CONTRACT",
10411
10567
  OP_WITHDRAWALS.erc20.ensureRegistered,
10412
10568
  async () => {
@@ -10419,7 +10575,7 @@ function routeErc20NonBase2() {
10419
10575
  message: "Failed to ensure token is registered in L2NativeTokenVault."
10420
10576
  }
10421
10577
  );
10422
- const assetData = await wrapAs8(
10578
+ const assetData = await wrapAs9(
10423
10579
  "INTERNAL",
10424
10580
  OP_WITHDRAWALS.erc20.encodeAssetData,
10425
10581
  () => Promise.resolve(
@@ -10431,7 +10587,7 @@ function routeErc20NonBase2() {
10431
10587
  }
10432
10588
  );
10433
10589
  const l2ar = await ctx.contracts.l2AssetRouter();
10434
- const dataWithdraw = await wrapAs8(
10590
+ const dataWithdraw = await wrapAs9(
10435
10591
  "INTERNAL",
10436
10592
  OP_WITHDRAWALS.erc20.encodeWithdraw,
10437
10593
  () => Promise.resolve(l2ar.interface.encodeFunctionData(SIG.withdraw, [assetId, assetData])),
@@ -10588,7 +10744,7 @@ function buildWithdrawalBundle(input) {
10588
10744
  }
10589
10745
 
10590
10746
  // src/adapters/ethers/resources/withdrawals/routes/interop-bundle.ts
10591
- var { wrapAs: wrapAs9 } = createErrorHandlers("withdrawals");
10747
+ var { wrapAs: wrapAs10 } = createErrorHandlers("withdrawals");
10592
10748
  var attributes = createEthersAttributesResource();
10593
10749
  function saltFor(sender, nonce) {
10594
10750
  return ethers.keccak256(
@@ -10607,7 +10763,7 @@ function routeInteropBundle() {
10607
10763
  if (isBaseToken) {
10608
10764
  assetId = ctx.baseTokenAssetId;
10609
10765
  } else {
10610
- assetId = await wrapAs9(
10766
+ assetId = await wrapAs10(
10611
10767
  "CONTRACT",
10612
10768
  OP_WITHDRAWALS.erc20.ensureRegistered,
10613
10769
  async () => {
@@ -10620,7 +10776,7 @@ function routeInteropBundle() {
10620
10776
  }
10621
10777
  );
10622
10778
  const erc20 = new ethers.Contract(p.token, IERC20_default, ctx.client.l2);
10623
- const current = await wrapAs9(
10779
+ const current = await wrapAs10(
10624
10780
  "CONTRACT",
10625
10781
  OP_WITHDRAWALS.erc20.allowance,
10626
10782
  () => erc20.allowance(ctx.sender, ctx.l2NativeTokenVault),
@@ -10656,7 +10812,7 @@ function routeInteropBundle() {
10656
10812
  });
10657
10813
  }
10658
10814
  }
10659
- const nonce = await wrapAs9(
10815
+ const nonce = await wrapAs10(
10660
10816
  "RPC",
10661
10817
  OP_WITHDRAWALS.prepare,
10662
10818
  () => ctx.client.l2.getTransactionCount(ctx.sender, "pending"),
@@ -10686,7 +10842,7 @@ function routeInteropBundle() {
10686
10842
  }
10687
10843
  });
10688
10844
  const interopCenter = await ctx.contracts.interopCenter();
10689
- const data = await wrapAs9(
10845
+ const data = await wrapAs10(
10690
10846
  "INTERNAL",
10691
10847
  OP_WITHDRAWALS.erc20.encodeWithdraw,
10692
10848
  () => Promise.resolve(
@@ -10901,7 +11057,7 @@ function createWithdrawalProtocolService(client, override) {
10901
11057
  }
10902
11058
 
10903
11059
  // src/adapters/ethers/resources/withdrawals/services/finalization.ts
10904
- var { wrapAs: wrapAs10 } = createErrorHandlers("withdrawals");
11060
+ var { wrapAs: wrapAs11 } = createErrorHandlers("withdrawals");
10905
11061
  var IL1NullifierMini = [
10906
11062
  "function isWithdrawalFinalized(uint256,uint256,uint256) view returns (bool)"
10907
11063
  ];
@@ -10911,7 +11067,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
10911
11067
  const { l1Nullifier } = await client.ensureAddresses();
10912
11068
  if (protocol === "legacy-withdrawal") return l1Nullifier;
10913
11069
  const nullifier = new ethers.Contract(l1Nullifier, IL1NullifierV32_default, l1);
10914
- const handler = await wrapAs10(
11070
+ const handler = await wrapAs11(
10915
11071
  "CONTRACT",
10916
11072
  OP_WITHDRAWALS.finalize.fetchParams.receipt,
10917
11073
  () => nullifier.l1InteropHandler(),
@@ -10923,7 +11079,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
10923
11079
  return handler;
10924
11080
  }
10925
11081
  async function fetchMessageAndProof(l2TxHash) {
10926
- const raw = await wrapAs10(
11082
+ const raw = await wrapAs11(
10927
11083
  "RPC",
10928
11084
  OP_WITHDRAWALS.finalize.fetchParams.receipt,
10929
11085
  () => client.zks.getReceiptWithL2ToL1(l2TxHash),
@@ -10940,7 +11096,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
10940
11096
  context: { l2TxHash }
10941
11097
  });
10942
11098
  }
10943
- const ev = await wrapAs10(
11099
+ const ev = await wrapAs11(
10944
11100
  "INTERNAL",
10945
11101
  OP_WITHDRAWALS.finalize.fetchParams.findMessage,
10946
11102
  // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-explicit-any
@@ -10950,7 +11106,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
10950
11106
  message: "Failed to locate L1MessageSent event in L2 receipt."
10951
11107
  }
10952
11108
  );
10953
- const message = await wrapAs10(
11109
+ const message = await wrapAs11(
10954
11110
  "INTERNAL",
10955
11111
  OP_WITHDRAWALS.finalize.fetchParams.decodeMessage,
10956
11112
  () => Promise.resolve(ethers.AbiCoder.defaultAbiCoder().decode(["bytes"], ev.data)[0]),
@@ -10959,7 +11115,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
10959
11115
  message: "Failed to decode withdrawal message."
10960
11116
  }
10961
11117
  );
10962
- const idx = await wrapAs10(
11118
+ const idx = await wrapAs11(
10963
11119
  "INTERNAL",
10964
11120
  OP_WITHDRAWALS.finalize.fetchParams.messengerIndex,
10965
11121
  () => Promise.resolve(messengerLogIndex(raw, { index: 0, messenger: L1_MESSENGER_ADDRESS })),
@@ -10968,7 +11124,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
10968
11124
  message: "Failed to derive messenger log index."
10969
11125
  }
10970
11126
  );
10971
- const proof = await wrapAs10(
11127
+ const proof = await wrapAs11(
10972
11128
  "RPC",
10973
11129
  OP_WITHDRAWALS.finalize.fetchParams.proof,
10974
11130
  () => client.zks.getL2ToL1LogProof(l2TxHash, idx),
@@ -10977,7 +11133,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
10977
11133
  message: "Failed to fetch L2\u2192L1 log proof."
10978
11134
  }
10979
11135
  );
10980
- const { chainId } = await wrapAs10(
11136
+ const { chainId } = await wrapAs11(
10981
11137
  "RPC",
10982
11138
  OP_WITHDRAWALS.finalize.fetchParams.network,
10983
11139
  () => l2.getNetwork(),
@@ -11036,7 +11192,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
11036
11192
  const target = await finalizationTarget(finalization.protocol);
11037
11193
  if (finalization.protocol === "legacy-withdrawal") {
11038
11194
  const c = new ethers.Contract(target, IL1NullifierMini, l1);
11039
- const done = await wrapAs10(
11195
+ const done = await wrapAs11(
11040
11196
  "RPC",
11041
11197
  OP_WITHDRAWALS.finalize.isFinalized,
11042
11198
  () => c.isWithdrawalFinalized(
@@ -11054,7 +11210,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
11054
11210
  const { bundleHash } = finalization.params;
11055
11211
  const handler = new ethers.Contract(target, IInteropHandler_default, l1);
11056
11212
  const status = Number(
11057
- await wrapAs10(
11213
+ await wrapAs11(
11058
11214
  "RPC",
11059
11215
  OP_WITHDRAWALS.finalize.isFinalized,
11060
11216
  () => handler.bundleStatus(bundleHash),
@@ -11066,7 +11222,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
11066
11222
  );
11067
11223
  if (status !== 3 /* Unbundled */) return classifyWithdrawalOutcome(status);
11068
11224
  const callStatus = Number(
11069
- await wrapAs10(
11225
+ await wrapAs11(
11070
11226
  "RPC",
11071
11227
  OP_WITHDRAWALS.finalize.isFinalized,
11072
11228
  () => handler.callStatus(bundleHash, 0),
@@ -11126,7 +11282,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
11126
11282
  async estimateFinalization(finalization) {
11127
11283
  const target = await finalizationTarget(finalization.protocol);
11128
11284
  const l1Signer = client.getL1Signer();
11129
- const gasLimit = await wrapAs10(
11285
+ const gasLimit = await wrapAs11(
11130
11286
  "RPC",
11131
11287
  OP_WITHDRAWALS.finalize.estimate,
11132
11288
  () => {
@@ -11145,7 +11301,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
11145
11301
  message: "Failed to estimate gas for withdrawal finalization."
11146
11302
  }
11147
11303
  );
11148
- const feeData = await wrapAs10("RPC", OP_WITHDRAWALS.finalize.estimate, () => l1.getFeeData(), {
11304
+ const feeData = await wrapAs11("RPC", OP_WITHDRAWALS.finalize.estimate, () => l1.getFeeData(), {
11149
11305
  ctx: { where: "l1.getFeeData" },
11150
11306
  message: "Failed to estimate fee data for withdrawal finalization."
11151
11307
  });