@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.
- package/dist/adapters/ethers/index.cjs +250 -94
- package/dist/adapters/ethers/index.cjs.map +1 -1
- package/dist/adapters/ethers/index.js +2 -2
- package/dist/adapters/ethers/resources/deposits/services/fee.d.ts +1 -0
- package/dist/adapters/ethers/resources/deposits/services/gas.d.ts +23 -3
- package/dist/adapters/ethers/sdk.cjs +250 -94
- package/dist/adapters/ethers/sdk.cjs.map +1 -1
- package/dist/adapters/ethers/sdk.js +2 -2
- package/dist/adapters/viem/index.cjs +280 -133
- package/dist/adapters/viem/index.cjs.map +1 -1
- package/dist/adapters/viem/index.js +2 -2
- package/dist/adapters/viem/resources/deposits/services/fee.d.ts +1 -0
- package/dist/adapters/viem/resources/deposits/services/gas.d.ts +22 -2
- package/dist/adapters/viem/sdk.cjs +280 -133
- package/dist/adapters/viem/sdk.cjs.map +1 -1
- package/dist/adapters/viem/sdk.js +2 -2
- package/dist/{chunk-5S63J6DW.js → chunk-FMBQ7PVA.js} +58 -10
- package/dist/{chunk-QMMFUWRV.js → chunk-VVDJFIXV.js} +224 -130
- package/dist/{chunk-B6P24GL5.js → chunk-YWUBX7YE.js} +194 -88
- package/dist/core/resources/deposits/gas.d.ts +11 -1
- package/dist/core/resources/deposits/priority.d.ts +46 -0
- package/package.json +1 -1
|
@@ -6231,6 +6231,7 @@ function isEraVmChain(chainIdL2) {
|
|
|
6231
6231
|
|
|
6232
6232
|
// src/core/resources/deposits/gas.ts
|
|
6233
6233
|
var CREATE_REESTIMATE_BUFFER = 15n;
|
|
6234
|
+
var ZERO_FEES = { maxFeePerGas: 0n, maxPriorityFeePerGas: 0n };
|
|
6234
6235
|
var maxBigInt = (a, b) => a > b ? a : b;
|
|
6235
6236
|
function applyGasBuffer(gasLimit, bufferPct = BUFFER) {
|
|
6236
6237
|
return gasLimit * (100n + bufferPct) / 100n;
|
|
@@ -6281,15 +6282,39 @@ async function fetchFees(estimator) {
|
|
|
6281
6282
|
const gp = await estimator.getGasPrice();
|
|
6282
6283
|
return { maxFeePerGas: gp, maxPriorityFeePerGas: 0n };
|
|
6283
6284
|
} catch {
|
|
6284
|
-
return
|
|
6285
|
+
return void 0;
|
|
6286
|
+
}
|
|
6287
|
+
}
|
|
6288
|
+
async function quoteL1Fees(input) {
|
|
6289
|
+
const { estimator, overrides } = input;
|
|
6290
|
+
const maxFeeOverride = overrides?.maxFeePerGas;
|
|
6291
|
+
const tipOverride = overrides?.maxPriorityFeePerGas;
|
|
6292
|
+
if (maxFeeOverride != null && tipOverride != null) {
|
|
6293
|
+
return { maxFeePerGas: maxFeeOverride, maxPriorityFeePerGas: tipOverride };
|
|
6294
|
+
}
|
|
6295
|
+
const market = await fetchFees(estimator);
|
|
6296
|
+
if (maxFeeOverride != null) {
|
|
6297
|
+
const tip = market?.maxPriorityFeePerGas ?? 0n;
|
|
6298
|
+
return {
|
|
6299
|
+
maxFeePerGas: maxFeeOverride,
|
|
6300
|
+
maxPriorityFeePerGas: tip < maxFeeOverride ? tip : maxFeeOverride
|
|
6301
|
+
};
|
|
6302
|
+
}
|
|
6303
|
+
if (market == null) {
|
|
6304
|
+
throw new Error("Could not fetch L1 gas price for Bridgehub base cost calculation.");
|
|
6305
|
+
}
|
|
6306
|
+
if (tipOverride != null) {
|
|
6307
|
+
const headroom = market.maxFeePerGas > market.maxPriorityFeePerGas ? market.maxFeePerGas - market.maxPriorityFeePerGas : 0n;
|
|
6308
|
+
return { maxFeePerGas: headroom + tipOverride, maxPriorityFeePerGas: tipOverride };
|
|
6285
6309
|
}
|
|
6310
|
+
return market;
|
|
6286
6311
|
}
|
|
6287
6312
|
async function quoteL1Gas(input) {
|
|
6288
6313
|
const { estimator, tx, overrides, fallbackGasLimit } = input;
|
|
6289
6314
|
let market;
|
|
6290
6315
|
const getMarket = async () => {
|
|
6291
6316
|
if (market) return market;
|
|
6292
|
-
market = await fetchFees(estimator);
|
|
6317
|
+
market = await fetchFees(estimator) ?? ZERO_FEES;
|
|
6293
6318
|
return market;
|
|
6294
6319
|
};
|
|
6295
6320
|
const maxFeePerGas = overrides?.maxFeePerGas ?? (tx.maxFeePerGas != null ? BigInt(tx.maxFeePerGas) : (await getMarket()).maxFeePerGas);
|
|
@@ -6311,7 +6336,7 @@ async function quoteL1Gas(input) {
|
|
|
6311
6336
|
}
|
|
6312
6337
|
async function quoteL2Gas(input) {
|
|
6313
6338
|
const { estimator, route, tx, gasPerPubdata, l2GasLimit, overrideGasLimit, stateOverrides } = input;
|
|
6314
|
-
const market = await fetchFees(estimator);
|
|
6339
|
+
const market = await fetchFees(estimator) ?? ZERO_FEES;
|
|
6315
6340
|
const maxFeePerGas = market.maxFeePerGas || market.maxPriorityFeePerGas || 0n;
|
|
6316
6341
|
const txGasLimit = tx?.gasLimit != null ? BigInt(tx.gasLimit) : void 0;
|
|
6317
6342
|
const explicit = overrideGasLimit ?? txGasLimit;
|
|
@@ -6352,12 +6377,7 @@ async function quoteL2Gas(input) {
|
|
|
6352
6377
|
}
|
|
6353
6378
|
}
|
|
6354
6379
|
async function quoteL2BaseCost(input) {
|
|
6355
|
-
const { estimator, encode: encode2, bridgehub, chainIdL2, l2GasLimit, gasPerPubdata } = input;
|
|
6356
|
-
const market = await fetchFees(estimator);
|
|
6357
|
-
const l1GasPrice = market.maxFeePerGas || market.maxPriorityFeePerGas || 0n;
|
|
6358
|
-
if (l1GasPrice === 0n) {
|
|
6359
|
-
throw new Error("Could not fetch L1 gas price for Bridgehub base cost calculation.");
|
|
6360
|
-
}
|
|
6380
|
+
const { estimator, encode: encode2, bridgehub, chainIdL2, l2GasLimit, gasPerPubdata, l1GasPrice } = input;
|
|
6361
6381
|
const data = encode2(IBridgehub_default, "l2TransactionBaseCost", [
|
|
6362
6382
|
chainIdL2,
|
|
6363
6383
|
l1GasPrice,
|
|
@@ -6370,8 +6390,6 @@ async function quoteL2BaseCost(input) {
|
|
|
6370
6390
|
});
|
|
6371
6391
|
return BigInt(raw);
|
|
6372
6392
|
}
|
|
6373
|
-
|
|
6374
|
-
// src/adapters/ethers/estimator.ts
|
|
6375
6393
|
function toCoreTx(tx) {
|
|
6376
6394
|
return {
|
|
6377
6395
|
to: tx.to,
|
|
@@ -6379,8 +6397,9 @@ function toCoreTx(tx) {
|
|
|
6379
6397
|
data: tx.data,
|
|
6380
6398
|
value: tx.value ? BigInt(tx.value) : void 0,
|
|
6381
6399
|
gasLimit: tx.gasLimit ? BigInt(tx.gasLimit) : void 0,
|
|
6382
|
-
|
|
6383
|
-
|
|
6400
|
+
// zero fees are explicit on zero-base-fee chains; dropping them would re-fetch the market tip
|
|
6401
|
+
maxFeePerGas: tx.maxFeePerGas != null ? BigInt(tx.maxFeePerGas) : void 0,
|
|
6402
|
+
maxPriorityFeePerGas: tx.maxPriorityFeePerGas != null ? BigInt(tx.maxPriorityFeePerGas) : void 0
|
|
6384
6403
|
};
|
|
6385
6404
|
}
|
|
6386
6405
|
function ethersToGasEstimator(provider) {
|
|
@@ -6420,7 +6439,13 @@ function ethersToGasEstimator(provider) {
|
|
|
6420
6439
|
throw new Error('Provider does not support "send"; cannot estimate priority tx gas.');
|
|
6421
6440
|
}
|
|
6422
6441
|
const result = await provider.send("eth_estimateGas", [
|
|
6423
|
-
{
|
|
6442
|
+
{
|
|
6443
|
+
from: tx.from,
|
|
6444
|
+
to: tx.to,
|
|
6445
|
+
data: tx.data,
|
|
6446
|
+
...tx.value != null ? { value: ethers.toQuantity(tx.value) } : {},
|
|
6447
|
+
type: ZKSYNC_OS_PRIORITY_TX_TYPE
|
|
6448
|
+
}
|
|
6424
6449
|
]);
|
|
6425
6450
|
return BigInt(result);
|
|
6426
6451
|
},
|
|
@@ -6473,7 +6498,7 @@ function createErrorOps(decodeRevert2) {
|
|
|
6473
6498
|
function wrap7(operation, fn, opts) {
|
|
6474
6499
|
return run("INTERNAL", operation, fn, opts);
|
|
6475
6500
|
}
|
|
6476
|
-
function
|
|
6501
|
+
function wrapAs11(kind, operation, fn, opts) {
|
|
6477
6502
|
return run(kind, operation, fn, opts);
|
|
6478
6503
|
}
|
|
6479
6504
|
async function toResult3(operation, fn, opts) {
|
|
@@ -6494,7 +6519,7 @@ function createErrorOps(decodeRevert2) {
|
|
|
6494
6519
|
return { ok: false, error: shaped };
|
|
6495
6520
|
}
|
|
6496
6521
|
}
|
|
6497
|
-
return { wrap: wrap7, wrapAs:
|
|
6522
|
+
return { wrap: wrap7, wrapAs: wrapAs11, toResult: toResult3 };
|
|
6498
6523
|
}
|
|
6499
6524
|
return { toZKsyncError: toZKsyncError2, createErrorHandlers: createErrorHandlers2 };
|
|
6500
6525
|
}
|
|
@@ -6638,7 +6663,7 @@ var encode = (abi2, fn, args) => {
|
|
|
6638
6663
|
return new ethers.Interface(abi2).encodeFunctionData(fn, args);
|
|
6639
6664
|
};
|
|
6640
6665
|
async function quoteL2BaseCost2(input) {
|
|
6641
|
-
const { ctx, l2GasLimit } = input;
|
|
6666
|
+
const { ctx, l2GasLimit, l1GasPrice } = input;
|
|
6642
6667
|
const estimator = ethersToGasEstimator(ctx.client.l1);
|
|
6643
6668
|
return wrapAs(
|
|
6644
6669
|
"RPC",
|
|
@@ -6649,17 +6674,36 @@ async function quoteL2BaseCost2(input) {
|
|
|
6649
6674
|
bridgehub: ctx.bridgehub,
|
|
6650
6675
|
chainIdL2: ctx.chainIdL2,
|
|
6651
6676
|
l2GasLimit,
|
|
6652
|
-
gasPerPubdata: ctx.gasPerPubdata
|
|
6677
|
+
gasPerPubdata: ctx.gasPerPubdata,
|
|
6678
|
+
l1GasPrice
|
|
6653
6679
|
}),
|
|
6654
6680
|
{ ctx: { chainIdL2: ctx.chainIdL2 } }
|
|
6655
6681
|
);
|
|
6656
6682
|
}
|
|
6657
6683
|
|
|
6658
6684
|
// src/core/resources/deposits/priority.ts
|
|
6685
|
+
var ZK_CHAIN_PRICING_GETTERS_ABI = [
|
|
6686
|
+
{
|
|
6687
|
+
type: "function",
|
|
6688
|
+
name: "getZKsyncOS",
|
|
6689
|
+
stateMutability: "view",
|
|
6690
|
+
inputs: [],
|
|
6691
|
+
outputs: [{ name: "", type: "bool" }]
|
|
6692
|
+
},
|
|
6693
|
+
{
|
|
6694
|
+
type: "function",
|
|
6695
|
+
name: "getPubdataPricingMode",
|
|
6696
|
+
stateMutability: "view",
|
|
6697
|
+
inputs: [],
|
|
6698
|
+
outputs: [{ name: "", type: "uint8" }]
|
|
6699
|
+
}
|
|
6700
|
+
];
|
|
6701
|
+
var PUBDATA_PRICING_MODE_ROLLUP = 0;
|
|
6659
6702
|
var PRIORITY_TX_ENCODING_STEP_BYTES = 544n;
|
|
6660
6703
|
var L1_TO_L2_ALIAS_OFFSET = 0x1111000000000000000000000000000000001111n;
|
|
6661
6704
|
var DEFAULT_PRIORITY_BODY_GAS_ESTIMATE_MULTIPLIER = 7n;
|
|
6662
6705
|
var PRIORITY_L2_GAS_BUFFER = 40n;
|
|
6706
|
+
var BASE_TOKEN_DEPOSIT_NEW_ACCOUNTS_PUBDATA_BYTES = 590n;
|
|
6663
6707
|
var maxBigInt2 = (a, b) => a > b ? a : b;
|
|
6664
6708
|
var ceilDiv = (a, b) => (a + b - 1n) / b;
|
|
6665
6709
|
function applyL1ToL2Alias(address) {
|
|
@@ -6706,6 +6750,16 @@ function clampPriorityL2GasLimit(input) {
|
|
|
6706
6750
|
})
|
|
6707
6751
|
);
|
|
6708
6752
|
}
|
|
6753
|
+
function resolveBaseTokenPriorityL2GasLimit(input) {
|
|
6754
|
+
if (input.nodeEstimate != null && input.nodeEstimate > 0n) {
|
|
6755
|
+
return maxBigInt2(input.priorityFloorGasLimit, applyGasBuffer(input.nodeEstimate));
|
|
6756
|
+
}
|
|
6757
|
+
if (!input.chargesPubdata) return input.priorityFloorGasLimit;
|
|
6758
|
+
return maxBigInt2(
|
|
6759
|
+
input.priorityFloorGasLimit,
|
|
6760
|
+
applyGasBuffer(BASE_TOKEN_DEPOSIT_NEW_ACCOUNTS_PUBDATA_BYTES * input.gasPerPubdata)
|
|
6761
|
+
);
|
|
6762
|
+
}
|
|
6709
6763
|
function resolveRegisteredTokenPriorityL2GasLimit(input) {
|
|
6710
6764
|
if (input.nodeEstimate != null && input.nodeEstimate > 0n) {
|
|
6711
6765
|
return maxBigInt2(input.priorityFloorGasLimit, applyGasBuffer(input.nodeEstimate));
|
|
@@ -6718,6 +6772,7 @@ function resolveRegisteredTokenPriorityL2GasLimit(input) {
|
|
|
6718
6772
|
}
|
|
6719
6773
|
|
|
6720
6774
|
// src/adapters/ethers/resources/deposits/services/gas.ts
|
|
6775
|
+
var { wrapAs: wrapAs2 } = createErrorHandlers("deposits");
|
|
6721
6776
|
var DEFAULT_SAFE_NONBASE_L2_GAS_LIMIT = 3000000n;
|
|
6722
6777
|
var ZERO_L2_TOKEN_ADDRESS = "0x0000000000000000000000000000000000000000";
|
|
6723
6778
|
async function estimatePriorityTxL2Gas(ctx, leg) {
|
|
@@ -6728,6 +6783,51 @@ async function estimatePriorityTxL2Gas(ctx, leg) {
|
|
|
6728
6783
|
return void 0;
|
|
6729
6784
|
}
|
|
6730
6785
|
}
|
|
6786
|
+
async function resolvePriorityTxL2Sender(ctx) {
|
|
6787
|
+
try {
|
|
6788
|
+
const code = await ctx.client.l1.getCode(ctx.sender);
|
|
6789
|
+
if (!code || code === "0x") return ctx.sender;
|
|
6790
|
+
} catch {
|
|
6791
|
+
}
|
|
6792
|
+
return applyL1ToL2Alias(ctx.sender);
|
|
6793
|
+
}
|
|
6794
|
+
var chainPricingCache = /* @__PURE__ */ new WeakMap();
|
|
6795
|
+
async function readChainPricing(ctx) {
|
|
6796
|
+
const cached = chainPricingCache.get(ctx.client)?.get(ctx.chainIdL2);
|
|
6797
|
+
if (cached) return cached;
|
|
6798
|
+
try {
|
|
6799
|
+
const bridgehub = new ethers.Contract(ctx.bridgehub, IBridgehub_default, ctx.client.l1);
|
|
6800
|
+
const zkChainAddress = await bridgehub.getZKChain(ctx.chainIdL2);
|
|
6801
|
+
const zkChain = new ethers.Contract(zkChainAddress, ZK_CHAIN_PRICING_GETTERS_ABI, ctx.client.l1);
|
|
6802
|
+
let zksyncOS;
|
|
6803
|
+
try {
|
|
6804
|
+
zksyncOS = await zkChain.getZKsyncOS();
|
|
6805
|
+
} catch (err) {
|
|
6806
|
+
if (!ethers.isError(err, "CALL_EXCEPTION")) throw err;
|
|
6807
|
+
zksyncOS = false;
|
|
6808
|
+
}
|
|
6809
|
+
const chargesPubdata = zksyncOS && Number(await zkChain.getPubdataPricingMode()) === PUBDATA_PRICING_MODE_ROLLUP;
|
|
6810
|
+
const pricing = { zksyncOS, chargesPubdata };
|
|
6811
|
+
const perClient = chainPricingCache.get(ctx.client) ?? /* @__PURE__ */ new Map();
|
|
6812
|
+
perClient.set(ctx.chainIdL2, pricing);
|
|
6813
|
+
chainPricingCache.set(ctx.client, perClient);
|
|
6814
|
+
return pricing;
|
|
6815
|
+
} catch {
|
|
6816
|
+
return void 0;
|
|
6817
|
+
}
|
|
6818
|
+
}
|
|
6819
|
+
async function quoteL1Fees2(input) {
|
|
6820
|
+
const { ctx } = input;
|
|
6821
|
+
return wrapAs2(
|
|
6822
|
+
"RPC",
|
|
6823
|
+
"deposits.fees.l1",
|
|
6824
|
+
() => quoteL1Fees({
|
|
6825
|
+
estimator: ethersToGasEstimator(ctx.client.l1),
|
|
6826
|
+
overrides: ctx.gasOverrides
|
|
6827
|
+
}),
|
|
6828
|
+
{ ctx: { chainIdL2: ctx.chainIdL2 } }
|
|
6829
|
+
);
|
|
6830
|
+
}
|
|
6731
6831
|
async function quoteL1Gas2(input) {
|
|
6732
6832
|
const { ctx, tx, overrides, fallbackGasLimit } = input;
|
|
6733
6833
|
const estimator = ethersToGasEstimator(ctx.client.l1);
|
|
@@ -6751,6 +6851,26 @@ async function quoteL2Gas2(input) {
|
|
|
6751
6851
|
stateOverrides: input.stateOverrides
|
|
6752
6852
|
});
|
|
6753
6853
|
}
|
|
6854
|
+
async function determineBaseL2GasLimit(input) {
|
|
6855
|
+
const { ctx } = input;
|
|
6856
|
+
if (ctx.l2GasLimit != null) return ctx.l2GasLimit;
|
|
6857
|
+
const [pricing, from] = await Promise.all([
|
|
6858
|
+
readChainPricing(ctx),
|
|
6859
|
+
resolvePriorityTxL2Sender(ctx)
|
|
6860
|
+
]);
|
|
6861
|
+
if (pricing && !pricing.zksyncOS) return input.priorityFloorGasLimit;
|
|
6862
|
+
return resolveBaseTokenPriorityL2GasLimit({
|
|
6863
|
+
priorityFloorGasLimit: input.priorityFloorGasLimit,
|
|
6864
|
+
gasPerPubdata: ctx.gasPerPubdata,
|
|
6865
|
+
chargesPubdata: pricing?.chargesPubdata ?? true,
|
|
6866
|
+
nodeEstimate: await estimatePriorityTxL2Gas(ctx, {
|
|
6867
|
+
from,
|
|
6868
|
+
to: input.l2Contract,
|
|
6869
|
+
data: input.l2Calldata,
|
|
6870
|
+
value: input.l2Value
|
|
6871
|
+
})
|
|
6872
|
+
});
|
|
6873
|
+
}
|
|
6754
6874
|
async function determineNonBaseL2Gas(input) {
|
|
6755
6875
|
const { ctx, l1Token, route } = input;
|
|
6756
6876
|
const fallbackQuote = () => quoteL2Gas2({
|
|
@@ -6911,13 +7031,19 @@ function routeEthDirect() {
|
|
|
6911
7031
|
l2Calldata,
|
|
6912
7032
|
gasPerPubdata: ctx.gasPerPubdata
|
|
6913
7033
|
});
|
|
6914
|
-
const quotedL2GasLimit =
|
|
6915
|
-
|
|
6916
|
-
|
|
6917
|
-
|
|
6918
|
-
}),
|
|
7034
|
+
const quotedL2GasLimit = await determineBaseL2GasLimit({
|
|
7035
|
+
ctx,
|
|
7036
|
+
l2Contract,
|
|
7037
|
+
l2Value,
|
|
6919
7038
|
l2Calldata,
|
|
6920
|
-
|
|
7039
|
+
priorityFloorGasLimit: clampPriorityL2GasLimit({
|
|
7040
|
+
gasLimit: applyPriorityL2GasLimitBuffer({
|
|
7041
|
+
chainIdL2: ctx.chainIdL2,
|
|
7042
|
+
gasLimit: priorityFloorBreakdown.derivedL2GasLimit
|
|
7043
|
+
}),
|
|
7044
|
+
l2Calldata,
|
|
7045
|
+
gasPerPubdata: ctx.gasPerPubdata
|
|
7046
|
+
})
|
|
6921
7047
|
});
|
|
6922
7048
|
const l2GasParams = await quoteL2Gas2({
|
|
6923
7049
|
ctx,
|
|
@@ -6927,7 +7053,12 @@ function routeEthDirect() {
|
|
|
6927
7053
|
if (!l2GasParams) {
|
|
6928
7054
|
throw new Error("Failed to estimate L2 gas for deposit.");
|
|
6929
7055
|
}
|
|
6930
|
-
const
|
|
7056
|
+
const l1Fees = await quoteL1Fees2({ ctx });
|
|
7057
|
+
const baseCost = await quoteL2BaseCost2({
|
|
7058
|
+
ctx,
|
|
7059
|
+
l2GasLimit: l2GasParams.gasLimit,
|
|
7060
|
+
l1GasPrice: l1Fees.maxFeePerGas
|
|
7061
|
+
});
|
|
6931
7062
|
const mintValue = baseCost + ctx.operatorTip + l2Value;
|
|
6932
7063
|
const req = buildDirectRequestStruct({
|
|
6933
7064
|
chainId: ctx.chainIdL2,
|
|
@@ -6944,7 +7075,8 @@ function routeEthDirect() {
|
|
|
6944
7075
|
data,
|
|
6945
7076
|
value: mintValue,
|
|
6946
7077
|
from: ctx.sender,
|
|
6947
|
-
...ctx.gasOverrides
|
|
7078
|
+
...ctx.gasOverrides,
|
|
7079
|
+
...l1Fees
|
|
6948
7080
|
};
|
|
6949
7081
|
const l1GasParams = await quoteL1Gas2({
|
|
6950
7082
|
ctx,
|
|
@@ -6999,7 +7131,7 @@ function createNTVCodec(deps) {
|
|
|
6999
7131
|
}
|
|
7000
7132
|
|
|
7001
7133
|
// src/adapters/ethers/resources/deposits/routes/erc20-nonbase.ts
|
|
7002
|
-
var { wrapAs:
|
|
7134
|
+
var { wrapAs: wrapAs3 } = createErrorHandlers("deposits");
|
|
7003
7135
|
var ZERO_L2_TOKEN_ADDRESS2 = "0x0000000000000000000000000000000000000000";
|
|
7004
7136
|
var ZERO_ASSET_ID = "0x0000000000000000000000000000000000000000000000000000000000000000";
|
|
7005
7137
|
var ntvCodec = createNTVCodec({
|
|
@@ -7082,7 +7214,7 @@ function routeErc20NonBase() {
|
|
|
7082
7214
|
async preflight(p, ctx) {
|
|
7083
7215
|
const resolved = ctx.resolvedToken ?? (ctx.tokens ? await ctx.tokens.resolve(p.token, { chain: "l1" }) : void 0);
|
|
7084
7216
|
const baseToken = ctx.baseTokenL1 ?? await ctx.client.baseToken(ctx.chainIdL2);
|
|
7085
|
-
await
|
|
7217
|
+
await wrapAs3(
|
|
7086
7218
|
"VALIDATION",
|
|
7087
7219
|
OP_DEPOSITS.nonbase.assertNonBaseToken,
|
|
7088
7220
|
() => {
|
|
@@ -7098,7 +7230,7 @@ function routeErc20NonBase() {
|
|
|
7098
7230
|
const baseToken = ctx.baseTokenL1 ?? await ctx.client.baseToken(ctx.chainIdL2);
|
|
7099
7231
|
const baseIsEth = ctx.baseIsEth ?? isETH(baseToken);
|
|
7100
7232
|
const receiver = p.to ?? ctx.sender;
|
|
7101
|
-
const secondBridgeCalldata = await
|
|
7233
|
+
const secondBridgeCalldata = await wrapAs3(
|
|
7102
7234
|
"INTERNAL",
|
|
7103
7235
|
OP_DEPOSITS.nonbase.encodeCalldata,
|
|
7104
7236
|
() => encodeSecondBridgeErc20DepositCalldata({
|
|
@@ -7132,14 +7264,19 @@ function routeErc20NonBase() {
|
|
|
7132
7264
|
}
|
|
7133
7265
|
});
|
|
7134
7266
|
if (!l2GasParams) throw new Error("Failed to establish L2 gas parameters.");
|
|
7135
|
-
const
|
|
7267
|
+
const l1Fees = await quoteL1Fees2({ ctx });
|
|
7268
|
+
const baseCost = await quoteL2BaseCost2({
|
|
7269
|
+
ctx,
|
|
7270
|
+
l2GasLimit: l2GasParams.gasLimit,
|
|
7271
|
+
l1GasPrice: l1Fees.maxFeePerGas
|
|
7272
|
+
});
|
|
7136
7273
|
const mintValue = baseCost + ctx.operatorTip;
|
|
7137
7274
|
const approvals = [];
|
|
7138
7275
|
const steps = [];
|
|
7139
7276
|
const assetRouter = ctx.l1AssetRouter;
|
|
7140
7277
|
const nativeTokenVault = ctx.l1NativeTokenVault;
|
|
7141
7278
|
const erc20Deposit = new ethers.Contract(p.token, IERC20_default, l1Signer);
|
|
7142
|
-
const allowanceToken = await
|
|
7279
|
+
const allowanceToken = await wrapAs3(
|
|
7143
7280
|
"RPC",
|
|
7144
7281
|
OP_DEPOSITS.nonbase.allowanceToken,
|
|
7145
7282
|
() => erc20Deposit.allowance(ctx.sender, nativeTokenVault),
|
|
@@ -7167,7 +7304,7 @@ function routeErc20NonBase() {
|
|
|
7167
7304
|
}
|
|
7168
7305
|
if (!baseIsEth) {
|
|
7169
7306
|
const erc20Base = new ethers.Contract(baseToken, IERC20_default, l1Signer);
|
|
7170
|
-
const allowanceBase = await
|
|
7307
|
+
const allowanceBase = await wrapAs3(
|
|
7171
7308
|
"RPC",
|
|
7172
7309
|
OP_DEPOSITS.nonbase.allowanceBase,
|
|
7173
7310
|
() => erc20Base.allowance(ctx.sender, nativeTokenVault),
|
|
@@ -7215,7 +7352,8 @@ function routeErc20NonBase() {
|
|
|
7215
7352
|
data,
|
|
7216
7353
|
value: txValue,
|
|
7217
7354
|
from: ctx.sender,
|
|
7218
|
-
...ctx.gasOverrides
|
|
7355
|
+
...ctx.gasOverrides,
|
|
7356
|
+
...l1Fees
|
|
7219
7357
|
};
|
|
7220
7358
|
const l1GasParams = await quoteL1Gas2({
|
|
7221
7359
|
ctx,
|
|
@@ -7250,7 +7388,7 @@ function routeErc20NonBase() {
|
|
|
7250
7388
|
}
|
|
7251
7389
|
};
|
|
7252
7390
|
}
|
|
7253
|
-
var { wrapAs:
|
|
7391
|
+
var { wrapAs: wrapAs4 } = createErrorHandlers("deposits");
|
|
7254
7392
|
var ZERO_L2_TOKEN_ADDRESS3 = "0x0000000000000000000000000000000000000000";
|
|
7255
7393
|
var ZERO_ASSET_ID2 = "0x0000000000000000000000000000000000000000000000000000000000000000";
|
|
7256
7394
|
var ntvCodec2 = createNTVCodec({
|
|
@@ -7326,7 +7464,7 @@ function routeEthNonBase() {
|
|
|
7326
7464
|
return {
|
|
7327
7465
|
async preflight(p, ctx) {
|
|
7328
7466
|
const resolved = ctx.resolvedToken ?? (ctx.tokens ? await ctx.tokens.resolve(p.token, { chain: "l1" }) : void 0);
|
|
7329
|
-
await
|
|
7467
|
+
await wrapAs4(
|
|
7330
7468
|
"VALIDATION",
|
|
7331
7469
|
OP_DEPOSITS.ethNonBase.assertEthAsset,
|
|
7332
7470
|
() => {
|
|
@@ -7336,7 +7474,7 @@ function routeEthNonBase() {
|
|
|
7336
7474
|
},
|
|
7337
7475
|
{ ctx: { token: p.token } }
|
|
7338
7476
|
);
|
|
7339
|
-
await
|
|
7477
|
+
await wrapAs4(
|
|
7340
7478
|
"VALIDATION",
|
|
7341
7479
|
OP_DEPOSITS.ethNonBase.assertNonEthBase,
|
|
7342
7480
|
() => {
|
|
@@ -7346,7 +7484,7 @@ function routeEthNonBase() {
|
|
|
7346
7484
|
},
|
|
7347
7485
|
{ ctx: { baseIsEth: ctx.baseIsEth, chainIdL2: ctx.chainIdL2 } }
|
|
7348
7486
|
);
|
|
7349
|
-
const ethBal = await
|
|
7487
|
+
const ethBal = await wrapAs4(
|
|
7350
7488
|
"RPC",
|
|
7351
7489
|
OP_DEPOSITS.ethNonBase.ethBalance,
|
|
7352
7490
|
() => ctx.client.l1.getBalance(ctx.sender),
|
|
@@ -7355,7 +7493,7 @@ function routeEthNonBase() {
|
|
|
7355
7493
|
message: "Failed to read L1 ETH balance."
|
|
7356
7494
|
}
|
|
7357
7495
|
);
|
|
7358
|
-
await
|
|
7496
|
+
await wrapAs4(
|
|
7359
7497
|
"VALIDATION",
|
|
7360
7498
|
OP_DEPOSITS.ethNonBase.assertEthBalance,
|
|
7361
7499
|
() => {
|
|
@@ -7390,12 +7528,17 @@ function routeEthNonBase() {
|
|
|
7390
7528
|
undeployedGasLimit: priorityGasModel.undeployedGasLimit
|
|
7391
7529
|
});
|
|
7392
7530
|
if (!l2GasParams) throw new Error("Failed to estimate L2 gas parameters.");
|
|
7393
|
-
const
|
|
7531
|
+
const l1Fees = await quoteL1Fees2({ ctx });
|
|
7532
|
+
const baseCost = await quoteL2BaseCost2({
|
|
7533
|
+
ctx,
|
|
7534
|
+
l2GasLimit: l2GasParams.gasLimit,
|
|
7535
|
+
l1GasPrice: l1Fees.maxFeePerGas
|
|
7536
|
+
});
|
|
7394
7537
|
const mintValue = baseCost + ctx.operatorTip;
|
|
7395
7538
|
const approvals = [];
|
|
7396
7539
|
const steps = [];
|
|
7397
7540
|
const erc20Base = new ethers.Contract(baseToken, IERC20_default, l1Signer);
|
|
7398
|
-
const allowance = await
|
|
7541
|
+
const allowance = await wrapAs4(
|
|
7399
7542
|
"RPC",
|
|
7400
7543
|
OP_DEPOSITS.ethNonBase.allowanceBase,
|
|
7401
7544
|
() => erc20Base.allowance(ctx.sender, ctx.l1NativeTokenVault),
|
|
@@ -7421,7 +7564,7 @@ function routeEthNonBase() {
|
|
|
7421
7564
|
}
|
|
7422
7565
|
});
|
|
7423
7566
|
}
|
|
7424
|
-
const secondBridgeCalldata = await
|
|
7567
|
+
const secondBridgeCalldata = await wrapAs4(
|
|
7425
7568
|
"INTERNAL",
|
|
7426
7569
|
OP_DEPOSITS.ethNonBase.encodeCalldata,
|
|
7427
7570
|
() => encodeSecondBridgeEthDepositCalldata({ ctx, amount: p.amount, receiver }),
|
|
@@ -7454,7 +7597,8 @@ function routeEthNonBase() {
|
|
|
7454
7597
|
data,
|
|
7455
7598
|
value: bridgehubValue,
|
|
7456
7599
|
from: ctx.sender,
|
|
7457
|
-
...ctx.gasOverrides
|
|
7600
|
+
...ctx.gasOverrides,
|
|
7601
|
+
...l1Fees
|
|
7458
7602
|
};
|
|
7459
7603
|
const l1GasParams = await quoteL1Gas2({
|
|
7460
7604
|
ctx,
|
|
@@ -7489,13 +7633,13 @@ function routeEthNonBase() {
|
|
|
7489
7633
|
}
|
|
7490
7634
|
};
|
|
7491
7635
|
}
|
|
7492
|
-
var { wrapAs:
|
|
7636
|
+
var { wrapAs: wrapAs5 } = createErrorHandlers("deposits");
|
|
7493
7637
|
var EMPTY_BYTES3 = "0x";
|
|
7494
7638
|
function routeErc20Base() {
|
|
7495
7639
|
return {
|
|
7496
7640
|
async preflight(p, ctx) {
|
|
7497
7641
|
const resolved = ctx.resolvedToken ?? (ctx.tokens ? await ctx.tokens.resolve(p.token, { chain: "l1" }) : void 0);
|
|
7498
|
-
await
|
|
7642
|
+
await wrapAs5(
|
|
7499
7643
|
"VALIDATION",
|
|
7500
7644
|
OP_DEPOSITS.base.assertErc20Asset,
|
|
7501
7645
|
() => {
|
|
@@ -7506,7 +7650,7 @@ function routeErc20Base() {
|
|
|
7506
7650
|
{ ctx: { token: p.token } }
|
|
7507
7651
|
);
|
|
7508
7652
|
const baseToken = ctx.baseTokenL1 ?? await ctx.client.baseToken(ctx.chainIdL2);
|
|
7509
|
-
await
|
|
7653
|
+
await wrapAs5(
|
|
7510
7654
|
"VALIDATION",
|
|
7511
7655
|
OP_DEPOSITS.base.assertMatchesBase,
|
|
7512
7656
|
() => {
|
|
@@ -7531,13 +7675,19 @@ function routeErc20Base() {
|
|
|
7531
7675
|
l2Calldata,
|
|
7532
7676
|
gasPerPubdata: ctx.gasPerPubdata
|
|
7533
7677
|
});
|
|
7534
|
-
const quotedL2GasLimit =
|
|
7535
|
-
|
|
7536
|
-
|
|
7537
|
-
|
|
7538
|
-
}),
|
|
7678
|
+
const quotedL2GasLimit = await determineBaseL2GasLimit({
|
|
7679
|
+
ctx,
|
|
7680
|
+
l2Contract,
|
|
7681
|
+
l2Value,
|
|
7539
7682
|
l2Calldata,
|
|
7540
|
-
|
|
7683
|
+
priorityFloorGasLimit: clampPriorityL2GasLimit({
|
|
7684
|
+
gasLimit: applyPriorityL2GasLimitBuffer({
|
|
7685
|
+
chainIdL2: ctx.chainIdL2,
|
|
7686
|
+
gasLimit: priorityFloorBreakdown.derivedL2GasLimit
|
|
7687
|
+
}),
|
|
7688
|
+
l2Calldata,
|
|
7689
|
+
gasPerPubdata: ctx.gasPerPubdata
|
|
7690
|
+
})
|
|
7541
7691
|
});
|
|
7542
7692
|
const l2GasParams = await quoteL2Gas2({
|
|
7543
7693
|
ctx,
|
|
@@ -7545,13 +7695,18 @@ function routeErc20Base() {
|
|
|
7545
7695
|
overrideGasLimit: quotedL2GasLimit
|
|
7546
7696
|
});
|
|
7547
7697
|
if (!l2GasParams) throw new Error("Failed to estimate L2 gas parameters.");
|
|
7548
|
-
const
|
|
7698
|
+
const l1Fees = await quoteL1Fees2({ ctx });
|
|
7699
|
+
const baseCost = await quoteL2BaseCost2({
|
|
7700
|
+
ctx,
|
|
7701
|
+
l2GasLimit: l2GasParams.gasLimit,
|
|
7702
|
+
l1GasPrice: l1Fees.maxFeePerGas
|
|
7703
|
+
});
|
|
7549
7704
|
const mintValue = baseCost + ctx.operatorTip + p.amount;
|
|
7550
7705
|
const approvals = [];
|
|
7551
7706
|
const steps = [];
|
|
7552
7707
|
{
|
|
7553
7708
|
const erc20 = new ethers.Contract(baseToken, IERC20_default, l1Signer);
|
|
7554
|
-
const allowance = await
|
|
7709
|
+
const allowance = await wrapAs5(
|
|
7555
7710
|
"RPC",
|
|
7556
7711
|
OP_DEPOSITS.base.allowance,
|
|
7557
7712
|
() => erc20.allowance(ctx.sender, ctx.l1NativeTokenVault),
|
|
@@ -7597,7 +7752,8 @@ function routeErc20Base() {
|
|
|
7597
7752
|
value: 0n,
|
|
7598
7753
|
// base token is ERC-20 ⇒ msg.value MUST be 0
|
|
7599
7754
|
from: ctx.sender,
|
|
7600
|
-
...ctx.gasOverrides
|
|
7755
|
+
...ctx.gasOverrides,
|
|
7756
|
+
...l1Fees
|
|
7601
7757
|
};
|
|
7602
7758
|
const l1GasParams = await quoteL1Gas2({
|
|
7603
7759
|
ctx,
|
|
@@ -7632,7 +7788,7 @@ function routeErc20Base() {
|
|
|
7632
7788
|
}
|
|
7633
7789
|
};
|
|
7634
7790
|
}
|
|
7635
|
-
var { wrapAs:
|
|
7791
|
+
var { wrapAs: wrapAs6 } = createErrorHandlers("tokens");
|
|
7636
7792
|
var abi = ethers.AbiCoder.defaultAbiCoder();
|
|
7637
7793
|
var ntvCodec3 = createNTVCodec({
|
|
7638
7794
|
encode: (types, values) => abi.encode(types, values),
|
|
@@ -7645,7 +7801,7 @@ function createTokensResource(client) {
|
|
|
7645
7801
|
let wethL2Promise = null;
|
|
7646
7802
|
async function getL1ChainId() {
|
|
7647
7803
|
if (!l2NtvL1ChainIdPromise) {
|
|
7648
|
-
l2NtvL1ChainIdPromise =
|
|
7804
|
+
l2NtvL1ChainIdPromise = wrapAs6("INTERNAL", "getL1ChainId", async () => {
|
|
7649
7805
|
const { l2NativeTokenVault } = await client.contracts();
|
|
7650
7806
|
const chainId = await l2NativeTokenVault.L1_CHAIN_ID();
|
|
7651
7807
|
return chainId;
|
|
@@ -7655,7 +7811,7 @@ function createTokensResource(client) {
|
|
|
7655
7811
|
}
|
|
7656
7812
|
async function getBaseTokenAssetId() {
|
|
7657
7813
|
if (!baseTokenAssetIdPromise) {
|
|
7658
|
-
baseTokenAssetIdPromise =
|
|
7814
|
+
baseTokenAssetIdPromise = wrapAs6("INTERNAL", "baseTokenAssetId", async () => {
|
|
7659
7815
|
const { l2NativeTokenVault } = await client.contracts();
|
|
7660
7816
|
const assetId = await l2NativeTokenVault.BASE_TOKEN_ASSET_ID();
|
|
7661
7817
|
return assetId;
|
|
@@ -7665,7 +7821,7 @@ function createTokensResource(client) {
|
|
|
7665
7821
|
}
|
|
7666
7822
|
async function getWethL1() {
|
|
7667
7823
|
if (!wethL1Promise) {
|
|
7668
|
-
wethL1Promise =
|
|
7824
|
+
wethL1Promise = wrapAs6("INTERNAL", "wethL1", async () => {
|
|
7669
7825
|
const { l1NativeTokenVault } = await client.contracts();
|
|
7670
7826
|
const weth = await l1NativeTokenVault.WETH_TOKEN();
|
|
7671
7827
|
return weth;
|
|
@@ -7675,7 +7831,7 @@ function createTokensResource(client) {
|
|
|
7675
7831
|
}
|
|
7676
7832
|
async function getWethL2() {
|
|
7677
7833
|
if (!wethL2Promise) {
|
|
7678
|
-
wethL2Promise =
|
|
7834
|
+
wethL2Promise = wrapAs6("INTERNAL", "wethL2", async () => {
|
|
7679
7835
|
const { l2NativeTokenVault } = await client.contracts();
|
|
7680
7836
|
const weth = await l2NativeTokenVault.WETH_TOKEN();
|
|
7681
7837
|
return weth;
|
|
@@ -7684,7 +7840,7 @@ function createTokensResource(client) {
|
|
|
7684
7840
|
return wethL2Promise;
|
|
7685
7841
|
}
|
|
7686
7842
|
async function toL2Address(l1Token) {
|
|
7687
|
-
return
|
|
7843
|
+
return wrapAs6("CONTRACT", "tokens.toL2Address", async () => {
|
|
7688
7844
|
const normalized = normalizeL1Token(l1Token);
|
|
7689
7845
|
const { chainId } = await client.l2.getNetwork();
|
|
7690
7846
|
const baseToken = await client.baseToken(BigInt(chainId));
|
|
@@ -7697,7 +7853,7 @@ function createTokensResource(client) {
|
|
|
7697
7853
|
});
|
|
7698
7854
|
}
|
|
7699
7855
|
async function toL1Address(l2Token) {
|
|
7700
|
-
return
|
|
7856
|
+
return wrapAs6("CONTRACT", "tokens.toL1Address", async () => {
|
|
7701
7857
|
if (isAddressEq(l2Token, ETH_ADDRESS)) {
|
|
7702
7858
|
return ETH_ADDRESS;
|
|
7703
7859
|
}
|
|
@@ -7720,7 +7876,7 @@ function createTokensResource(client) {
|
|
|
7720
7876
|
});
|
|
7721
7877
|
}
|
|
7722
7878
|
async function assetIdOfL1(l1Token) {
|
|
7723
|
-
return
|
|
7879
|
+
return wrapAs6("CONTRACT", "tokens.assetIdOfL1", async () => {
|
|
7724
7880
|
const normalized = normalizeL1Token(l1Token);
|
|
7725
7881
|
const { l1NativeTokenVault } = await client.contracts();
|
|
7726
7882
|
const assetId = await l1NativeTokenVault.assetId(normalized);
|
|
@@ -7728,28 +7884,28 @@ function createTokensResource(client) {
|
|
|
7728
7884
|
});
|
|
7729
7885
|
}
|
|
7730
7886
|
async function assetIdOfL2(l2Token) {
|
|
7731
|
-
return
|
|
7887
|
+
return wrapAs6("CONTRACT", "tokens.assetIdOfL2", async () => {
|
|
7732
7888
|
const { l2NativeTokenVault } = await client.contracts();
|
|
7733
7889
|
const assetId = await l2NativeTokenVault.assetId(l2Token);
|
|
7734
7890
|
return assetId;
|
|
7735
7891
|
});
|
|
7736
7892
|
}
|
|
7737
7893
|
async function l2TokenFromAssetId(assetId) {
|
|
7738
|
-
return
|
|
7894
|
+
return wrapAs6("CONTRACT", "tokens.l2TokenFromAssetId", async () => {
|
|
7739
7895
|
const { l2NativeTokenVault } = await client.contracts();
|
|
7740
7896
|
const tokenAddr = await l2NativeTokenVault.tokenAddress(assetId);
|
|
7741
7897
|
return tokenAddr;
|
|
7742
7898
|
});
|
|
7743
7899
|
}
|
|
7744
7900
|
async function l1TokenFromAssetId(assetId) {
|
|
7745
|
-
return
|
|
7901
|
+
return wrapAs6("CONTRACT", "tokens.l1TokenFromAssetId", async () => {
|
|
7746
7902
|
const { l1NativeTokenVault } = await client.contracts();
|
|
7747
7903
|
const tokenAddr = await l1NativeTokenVault.tokenAddress(assetId);
|
|
7748
7904
|
return tokenAddr;
|
|
7749
7905
|
});
|
|
7750
7906
|
}
|
|
7751
7907
|
async function originChainId(assetId) {
|
|
7752
|
-
return
|
|
7908
|
+
return wrapAs6("CONTRACT", "tokens.originChainId", async () => {
|
|
7753
7909
|
const { l2NativeTokenVault } = await client.contracts();
|
|
7754
7910
|
const chainId = await l2NativeTokenVault.originChainId(assetId);
|
|
7755
7911
|
return chainId;
|
|
@@ -7759,7 +7915,7 @@ function createTokensResource(client) {
|
|
|
7759
7915
|
return getBaseTokenAssetId();
|
|
7760
7916
|
}
|
|
7761
7917
|
async function isChainEthBased() {
|
|
7762
|
-
return
|
|
7918
|
+
return wrapAs6("CONTRACT", "tokens.isChainEthBased", async () => {
|
|
7763
7919
|
const baseAssetId = await getBaseTokenAssetId();
|
|
7764
7920
|
const l1ChainId = await getL1ChainId();
|
|
7765
7921
|
const ethAssetId = ntvCodec3.encodeAssetId(
|
|
@@ -7777,7 +7933,7 @@ function createTokensResource(client) {
|
|
|
7777
7933
|
return getWethL2();
|
|
7778
7934
|
}
|
|
7779
7935
|
async function computeL2BridgedAddress(args) {
|
|
7780
|
-
return
|
|
7936
|
+
return wrapAs6("CONTRACT", "tokens.computeL2BridgedAddress", async () => {
|
|
7781
7937
|
const normalized = normalizeL1Token(args.l1Token);
|
|
7782
7938
|
const { l2NativeTokenVault } = await client.contracts();
|
|
7783
7939
|
const predicted = await l2NativeTokenVault.calculateCreate2TokenAddress(
|
|
@@ -7788,7 +7944,7 @@ function createTokensResource(client) {
|
|
|
7788
7944
|
});
|
|
7789
7945
|
}
|
|
7790
7946
|
async function resolve(ref, opts) {
|
|
7791
|
-
return
|
|
7947
|
+
return wrapAs6("CONTRACT", "tokens.resolve", async () => {
|
|
7792
7948
|
let chain;
|
|
7793
7949
|
let address;
|
|
7794
7950
|
if (typeof ref === "string") {
|
|
@@ -8355,13 +8511,13 @@ function buildFeeBreakdown2(p) {
|
|
|
8355
8511
|
}
|
|
8356
8512
|
|
|
8357
8513
|
// src/adapters/ethers/resources/withdrawals/routes/eth.ts
|
|
8358
|
-
var { wrapAs:
|
|
8514
|
+
var { wrapAs: wrapAs7 } = createErrorHandlers("withdrawals");
|
|
8359
8515
|
function routeEthBase() {
|
|
8360
8516
|
return {
|
|
8361
8517
|
async build(p, ctx) {
|
|
8362
8518
|
const steps = [];
|
|
8363
8519
|
const base = await ctx.contracts.l2BaseTokenSystem();
|
|
8364
|
-
const data = await
|
|
8520
|
+
const data = await wrapAs7(
|
|
8365
8521
|
"INTERNAL",
|
|
8366
8522
|
OP_WITHDRAWALS.eth.encodeWithdraw,
|
|
8367
8523
|
() => Promise.resolve(base.interface.encodeFunctionData("withdraw", [p.to ?? ctx.sender])),
|
|
@@ -8396,7 +8552,7 @@ function routeEthBase() {
|
|
|
8396
8552
|
}
|
|
8397
8553
|
};
|
|
8398
8554
|
}
|
|
8399
|
-
var { wrapAs:
|
|
8555
|
+
var { wrapAs: wrapAs8 } = createErrorHandlers("withdrawals");
|
|
8400
8556
|
var SIG = {
|
|
8401
8557
|
withdraw: "withdraw(bytes32,bytes)"
|
|
8402
8558
|
};
|
|
@@ -8406,7 +8562,7 @@ function routeErc20NonBase2() {
|
|
|
8406
8562
|
const steps = [];
|
|
8407
8563
|
const approvals = [];
|
|
8408
8564
|
const erc20 = new ethers.Contract(p.token, IERC20_default, ctx.client.l2);
|
|
8409
|
-
const current = await
|
|
8565
|
+
const current = await wrapAs8(
|
|
8410
8566
|
"CONTRACT",
|
|
8411
8567
|
OP_WITHDRAWALS.erc20.allowance,
|
|
8412
8568
|
() => erc20.allowance(ctx.sender, ctx.l2NativeTokenVault),
|
|
@@ -8444,7 +8600,7 @@ function routeErc20NonBase2() {
|
|
|
8444
8600
|
tx: approveTx
|
|
8445
8601
|
});
|
|
8446
8602
|
}
|
|
8447
|
-
const assetId = await
|
|
8603
|
+
const assetId = await wrapAs8(
|
|
8448
8604
|
"CONTRACT",
|
|
8449
8605
|
OP_WITHDRAWALS.erc20.ensureRegistered,
|
|
8450
8606
|
async () => {
|
|
@@ -8457,7 +8613,7 @@ function routeErc20NonBase2() {
|
|
|
8457
8613
|
message: "Failed to ensure token is registered in L2NativeTokenVault."
|
|
8458
8614
|
}
|
|
8459
8615
|
);
|
|
8460
|
-
const assetData = await
|
|
8616
|
+
const assetData = await wrapAs8(
|
|
8461
8617
|
"INTERNAL",
|
|
8462
8618
|
OP_WITHDRAWALS.erc20.encodeAssetData,
|
|
8463
8619
|
() => Promise.resolve(
|
|
@@ -8469,7 +8625,7 @@ function routeErc20NonBase2() {
|
|
|
8469
8625
|
}
|
|
8470
8626
|
);
|
|
8471
8627
|
const l2ar = await ctx.contracts.l2AssetRouter();
|
|
8472
|
-
const dataWithdraw = await
|
|
8628
|
+
const dataWithdraw = await wrapAs8(
|
|
8473
8629
|
"INTERNAL",
|
|
8474
8630
|
OP_WITHDRAWALS.erc20.encodeWithdraw,
|
|
8475
8631
|
() => Promise.resolve(l2ar.interface.encodeFunctionData(SIG.withdraw, [assetId, assetData])),
|
|
@@ -8626,7 +8782,7 @@ function buildWithdrawalBundle(input) {
|
|
|
8626
8782
|
}
|
|
8627
8783
|
|
|
8628
8784
|
// src/adapters/ethers/resources/withdrawals/routes/interop-bundle.ts
|
|
8629
|
-
var { wrapAs:
|
|
8785
|
+
var { wrapAs: wrapAs9 } = createErrorHandlers("withdrawals");
|
|
8630
8786
|
var attributes = createEthersAttributesResource();
|
|
8631
8787
|
function saltFor(sender, nonce) {
|
|
8632
8788
|
return ethers.keccak256(
|
|
@@ -8645,7 +8801,7 @@ function routeInteropBundle() {
|
|
|
8645
8801
|
if (isBaseToken) {
|
|
8646
8802
|
assetId = ctx.baseTokenAssetId;
|
|
8647
8803
|
} else {
|
|
8648
|
-
assetId = await
|
|
8804
|
+
assetId = await wrapAs9(
|
|
8649
8805
|
"CONTRACT",
|
|
8650
8806
|
OP_WITHDRAWALS.erc20.ensureRegistered,
|
|
8651
8807
|
async () => {
|
|
@@ -8658,7 +8814,7 @@ function routeInteropBundle() {
|
|
|
8658
8814
|
}
|
|
8659
8815
|
);
|
|
8660
8816
|
const erc20 = new ethers.Contract(p.token, IERC20_default, ctx.client.l2);
|
|
8661
|
-
const current = await
|
|
8817
|
+
const current = await wrapAs9(
|
|
8662
8818
|
"CONTRACT",
|
|
8663
8819
|
OP_WITHDRAWALS.erc20.allowance,
|
|
8664
8820
|
() => erc20.allowance(ctx.sender, ctx.l2NativeTokenVault),
|
|
@@ -8694,7 +8850,7 @@ function routeInteropBundle() {
|
|
|
8694
8850
|
});
|
|
8695
8851
|
}
|
|
8696
8852
|
}
|
|
8697
|
-
const nonce = await
|
|
8853
|
+
const nonce = await wrapAs9(
|
|
8698
8854
|
"RPC",
|
|
8699
8855
|
OP_WITHDRAWALS.prepare,
|
|
8700
8856
|
() => ctx.client.l2.getTransactionCount(ctx.sender, "pending"),
|
|
@@ -8724,7 +8880,7 @@ function routeInteropBundle() {
|
|
|
8724
8880
|
}
|
|
8725
8881
|
});
|
|
8726
8882
|
const interopCenter = await ctx.contracts.interopCenter();
|
|
8727
|
-
const data = await
|
|
8883
|
+
const data = await wrapAs9(
|
|
8728
8884
|
"INTERNAL",
|
|
8729
8885
|
OP_WITHDRAWALS.erc20.encodeWithdraw,
|
|
8730
8886
|
() => Promise.resolve(
|
|
@@ -8939,7 +9095,7 @@ function createWithdrawalProtocolService(client, override) {
|
|
|
8939
9095
|
}
|
|
8940
9096
|
|
|
8941
9097
|
// src/adapters/ethers/resources/withdrawals/services/finalization.ts
|
|
8942
|
-
var { wrapAs:
|
|
9098
|
+
var { wrapAs: wrapAs10 } = createErrorHandlers("withdrawals");
|
|
8943
9099
|
var IL1NullifierMini = [
|
|
8944
9100
|
"function isWithdrawalFinalized(uint256,uint256,uint256) view returns (bool)"
|
|
8945
9101
|
];
|
|
@@ -8949,7 +9105,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
|
|
|
8949
9105
|
const { l1Nullifier } = await client.ensureAddresses();
|
|
8950
9106
|
if (protocol === "legacy-withdrawal") return l1Nullifier;
|
|
8951
9107
|
const nullifier = new ethers.Contract(l1Nullifier, IL1NullifierV32_default, l1);
|
|
8952
|
-
const handler = await
|
|
9108
|
+
const handler = await wrapAs10(
|
|
8953
9109
|
"CONTRACT",
|
|
8954
9110
|
OP_WITHDRAWALS.finalize.fetchParams.receipt,
|
|
8955
9111
|
() => nullifier.l1InteropHandler(),
|
|
@@ -8961,7 +9117,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
|
|
|
8961
9117
|
return handler;
|
|
8962
9118
|
}
|
|
8963
9119
|
async function fetchMessageAndProof(l2TxHash) {
|
|
8964
|
-
const raw = await
|
|
9120
|
+
const raw = await wrapAs10(
|
|
8965
9121
|
"RPC",
|
|
8966
9122
|
OP_WITHDRAWALS.finalize.fetchParams.receipt,
|
|
8967
9123
|
() => client.zks.getReceiptWithL2ToL1(l2TxHash),
|
|
@@ -8978,7 +9134,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
|
|
|
8978
9134
|
context: { l2TxHash }
|
|
8979
9135
|
});
|
|
8980
9136
|
}
|
|
8981
|
-
const ev = await
|
|
9137
|
+
const ev = await wrapAs10(
|
|
8982
9138
|
"INTERNAL",
|
|
8983
9139
|
OP_WITHDRAWALS.finalize.fetchParams.findMessage,
|
|
8984
9140
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-explicit-any
|
|
@@ -8988,7 +9144,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
|
|
|
8988
9144
|
message: "Failed to locate L1MessageSent event in L2 receipt."
|
|
8989
9145
|
}
|
|
8990
9146
|
);
|
|
8991
|
-
const message = await
|
|
9147
|
+
const message = await wrapAs10(
|
|
8992
9148
|
"INTERNAL",
|
|
8993
9149
|
OP_WITHDRAWALS.finalize.fetchParams.decodeMessage,
|
|
8994
9150
|
() => Promise.resolve(ethers.AbiCoder.defaultAbiCoder().decode(["bytes"], ev.data)[0]),
|
|
@@ -8997,7 +9153,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
|
|
|
8997
9153
|
message: "Failed to decode withdrawal message."
|
|
8998
9154
|
}
|
|
8999
9155
|
);
|
|
9000
|
-
const idx = await
|
|
9156
|
+
const idx = await wrapAs10(
|
|
9001
9157
|
"INTERNAL",
|
|
9002
9158
|
OP_WITHDRAWALS.finalize.fetchParams.messengerIndex,
|
|
9003
9159
|
() => Promise.resolve(messengerLogIndex(raw, { index: 0, messenger: L1_MESSENGER_ADDRESS })),
|
|
@@ -9006,7 +9162,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
|
|
|
9006
9162
|
message: "Failed to derive messenger log index."
|
|
9007
9163
|
}
|
|
9008
9164
|
);
|
|
9009
|
-
const proof = await
|
|
9165
|
+
const proof = await wrapAs10(
|
|
9010
9166
|
"RPC",
|
|
9011
9167
|
OP_WITHDRAWALS.finalize.fetchParams.proof,
|
|
9012
9168
|
() => client.zks.getL2ToL1LogProof(l2TxHash, idx),
|
|
@@ -9015,7 +9171,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
|
|
|
9015
9171
|
message: "Failed to fetch L2\u2192L1 log proof."
|
|
9016
9172
|
}
|
|
9017
9173
|
);
|
|
9018
|
-
const { chainId } = await
|
|
9174
|
+
const { chainId } = await wrapAs10(
|
|
9019
9175
|
"RPC",
|
|
9020
9176
|
OP_WITHDRAWALS.finalize.fetchParams.network,
|
|
9021
9177
|
() => l2.getNetwork(),
|
|
@@ -9074,7 +9230,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
|
|
|
9074
9230
|
const target = await finalizationTarget(finalization.protocol);
|
|
9075
9231
|
if (finalization.protocol === "legacy-withdrawal") {
|
|
9076
9232
|
const c = new ethers.Contract(target, IL1NullifierMini, l1);
|
|
9077
|
-
const done = await
|
|
9233
|
+
const done = await wrapAs10(
|
|
9078
9234
|
"RPC",
|
|
9079
9235
|
OP_WITHDRAWALS.finalize.isFinalized,
|
|
9080
9236
|
() => c.isWithdrawalFinalized(
|
|
@@ -9092,7 +9248,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
|
|
|
9092
9248
|
const { bundleHash } = finalization.params;
|
|
9093
9249
|
const handler = new ethers.Contract(target, IInteropHandler_default, l1);
|
|
9094
9250
|
const status = Number(
|
|
9095
|
-
await
|
|
9251
|
+
await wrapAs10(
|
|
9096
9252
|
"RPC",
|
|
9097
9253
|
OP_WITHDRAWALS.finalize.isFinalized,
|
|
9098
9254
|
() => handler.bundleStatus(bundleHash),
|
|
@@ -9104,7 +9260,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
|
|
|
9104
9260
|
);
|
|
9105
9261
|
if (status !== 3 /* Unbundled */) return classifyWithdrawalOutcome(status);
|
|
9106
9262
|
const callStatus = Number(
|
|
9107
|
-
await
|
|
9263
|
+
await wrapAs10(
|
|
9108
9264
|
"RPC",
|
|
9109
9265
|
OP_WITHDRAWALS.finalize.isFinalized,
|
|
9110
9266
|
() => handler.callStatus(bundleHash, 0),
|
|
@@ -9164,7 +9320,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
|
|
|
9164
9320
|
async estimateFinalization(finalization) {
|
|
9165
9321
|
const target = await finalizationTarget(finalization.protocol);
|
|
9166
9322
|
const l1Signer = client.getL1Signer();
|
|
9167
|
-
const gasLimit = await
|
|
9323
|
+
const gasLimit = await wrapAs10(
|
|
9168
9324
|
"RPC",
|
|
9169
9325
|
OP_WITHDRAWALS.finalize.estimate,
|
|
9170
9326
|
() => {
|
|
@@ -9183,7 +9339,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
|
|
|
9183
9339
|
message: "Failed to estimate gas for withdrawal finalization."
|
|
9184
9340
|
}
|
|
9185
9341
|
);
|
|
9186
|
-
const feeData = await
|
|
9342
|
+
const feeData = await wrapAs10("RPC", OP_WITHDRAWALS.finalize.estimate, () => l1.getFeeData(), {
|
|
9187
9343
|
ctx: { where: "l1.getFeeData" },
|
|
9188
9344
|
message: "Failed to estimate fee data for withdrawal finalization."
|
|
9189
9345
|
});
|