@matterlabs/zksync-js 0.0.23 → 0.0.25
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/client.js +4 -4
- package/dist/adapters/ethers/index.cjs +155 -82
- package/dist/adapters/ethers/index.cjs.map +1 -1
- package/dist/adapters/ethers/index.js +7 -7
- package/dist/adapters/ethers/resources/deposits/services/fee.d.ts +1 -0
- package/dist/adapters/ethers/resources/deposits/services/gas.d.ts +9 -2
- package/dist/adapters/ethers/sdk.cjs +155 -91
- package/dist/adapters/ethers/sdk.cjs.map +1 -1
- package/dist/adapters/ethers/sdk.js +6 -6
- package/dist/adapters/viem/client.js +4 -4
- package/dist/adapters/viem/index.cjs +182 -122
- package/dist/adapters/viem/index.cjs.map +1 -1
- package/dist/adapters/viem/index.js +7 -7
- package/dist/adapters/viem/resources/deposits/services/fee.d.ts +1 -0
- package/dist/adapters/viem/resources/deposits/services/gas.d.ts +9 -2
- package/dist/adapters/viem/sdk.cjs +182 -135
- package/dist/adapters/viem/sdk.cjs.map +1 -1
- package/dist/adapters/viem/sdk.js +6 -6
- package/dist/{chunk-4GPIHYVF.js → chunk-4ZANKNIK.js} +1 -1
- package/dist/{chunk-JJ523MOL.js → chunk-BQ2YCWV2.js} +1 -1
- package/dist/{chunk-4M7VNYGC.js → chunk-H5A6GU3D.js} +2 -2
- package/dist/{chunk-2DDJFHHD.js → chunk-JNS4XZE2.js} +1 -1
- package/dist/{chunk-WPCZNITC.js → chunk-JWN26CQ6.js} +31 -11
- package/dist/{chunk-V2TDNGI5.js → chunk-N5E4FLBF.js} +127 -74
- package/dist/{chunk-NVOFHV3A.js → chunk-NFRRRT5X.js} +155 -120
- package/dist/{chunk-URHDNDFN.js → chunk-PNTR5FTL.js} +2 -2
- package/dist/{chunk-TUN6NH5D.js → chunk-RZH7HBH3.js} +2 -2
- package/dist/{chunk-6WIAMFIW.js → chunk-YEA74D2L.js} +2 -2
- package/dist/{chunk-X2JJDQ4O.js → chunk-YGXEIOK6.js} +1 -1
- package/dist/core/index.js +3 -3
- package/dist/core/resources/deposits/gas.d.ts +11 -1
- package/dist/core/types/errors.d.ts +1 -1
- package/dist/index.js +2 -2
- package/package.json +1 -1
|
@@ -317,7 +317,7 @@ var OP_DEPOSITS = {
|
|
|
317
317
|
ethNonBase: {
|
|
318
318
|
allowanceBase: "deposits.eth-nonbase:allowanceBaseToken",
|
|
319
319
|
ethBalance: "deposits.eth-nonbase:getEthBalance",
|
|
320
|
-
encodeCalldata: "deposits.eth-nonbase:
|
|
320
|
+
encodeCalldata: "deposits.eth-nonbase:encodeSecondBridgeEthDepositCalldata",
|
|
321
321
|
assertEthAsset: "deposits.eth-nonbase:assertEthAsset",
|
|
322
322
|
assertNonEthBase: "deposits.eth-nonbase:assertNonEthBase",
|
|
323
323
|
assertEthBalance: "deposits.eth-nonbase:assertEthBalance"
|
|
@@ -6209,15 +6209,6 @@ function encodeSecondBridgeDataV1(assetId, transferData) {
|
|
|
6209
6209
|
const data = abi2.encode(["bytes32", "bytes"], [assetId, transferData]);
|
|
6210
6210
|
return ethers.ethers.concat(["0x01", data]);
|
|
6211
6211
|
}
|
|
6212
|
-
function encodeSecondBridgeArgs(token, amount, l2Receiver) {
|
|
6213
|
-
return ethers.AbiCoder.defaultAbiCoder().encode(
|
|
6214
|
-
["address", "uint256", "address"],
|
|
6215
|
-
[token, amount, l2Receiver]
|
|
6216
|
-
);
|
|
6217
|
-
}
|
|
6218
|
-
function encodeSecondBridgeEthArgs(amount, l2Receiver, ethToken = ETH_ADDRESS) {
|
|
6219
|
-
return encodeSecondBridgeArgs(ethToken, amount, l2Receiver);
|
|
6220
|
-
}
|
|
6221
6212
|
function buildDirectRequestStruct(args) {
|
|
6222
6213
|
return {
|
|
6223
6214
|
chainId: args.chainId,
|
|
@@ -6240,6 +6231,7 @@ function isEraVmChain(chainIdL2) {
|
|
|
6240
6231
|
|
|
6241
6232
|
// src/core/resources/deposits/gas.ts
|
|
6242
6233
|
var CREATE_REESTIMATE_BUFFER = 15n;
|
|
6234
|
+
var ZERO_FEES = { maxFeePerGas: 0n, maxPriorityFeePerGas: 0n };
|
|
6243
6235
|
var maxBigInt = (a, b) => a > b ? a : b;
|
|
6244
6236
|
function applyGasBuffer(gasLimit, bufferPct = BUFFER) {
|
|
6245
6237
|
return gasLimit * (100n + bufferPct) / 100n;
|
|
@@ -6290,15 +6282,39 @@ async function fetchFees(estimator) {
|
|
|
6290
6282
|
const gp = await estimator.getGasPrice();
|
|
6291
6283
|
return { maxFeePerGas: gp, maxPriorityFeePerGas: 0n };
|
|
6292
6284
|
} catch {
|
|
6293
|
-
return
|
|
6285
|
+
return void 0;
|
|
6294
6286
|
}
|
|
6295
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 };
|
|
6309
|
+
}
|
|
6310
|
+
return market;
|
|
6311
|
+
}
|
|
6296
6312
|
async function quoteL1Gas(input) {
|
|
6297
6313
|
const { estimator, tx, overrides, fallbackGasLimit } = input;
|
|
6298
6314
|
let market;
|
|
6299
6315
|
const getMarket = async () => {
|
|
6300
6316
|
if (market) return market;
|
|
6301
|
-
market = await fetchFees(estimator);
|
|
6317
|
+
market = await fetchFees(estimator) ?? ZERO_FEES;
|
|
6302
6318
|
return market;
|
|
6303
6319
|
};
|
|
6304
6320
|
const maxFeePerGas = overrides?.maxFeePerGas ?? (tx.maxFeePerGas != null ? BigInt(tx.maxFeePerGas) : (await getMarket()).maxFeePerGas);
|
|
@@ -6320,7 +6336,7 @@ async function quoteL1Gas(input) {
|
|
|
6320
6336
|
}
|
|
6321
6337
|
async function quoteL2Gas(input) {
|
|
6322
6338
|
const { estimator, route, tx, gasPerPubdata, l2GasLimit, overrideGasLimit, stateOverrides } = input;
|
|
6323
|
-
const market = await fetchFees(estimator);
|
|
6339
|
+
const market = await fetchFees(estimator) ?? ZERO_FEES;
|
|
6324
6340
|
const maxFeePerGas = market.maxFeePerGas || market.maxPriorityFeePerGas || 0n;
|
|
6325
6341
|
const txGasLimit = tx?.gasLimit != null ? BigInt(tx.gasLimit) : void 0;
|
|
6326
6342
|
const explicit = overrideGasLimit ?? txGasLimit;
|
|
@@ -6361,12 +6377,7 @@ async function quoteL2Gas(input) {
|
|
|
6361
6377
|
}
|
|
6362
6378
|
}
|
|
6363
6379
|
async function quoteL2BaseCost(input) {
|
|
6364
|
-
const { estimator, encode: encode2, bridgehub, chainIdL2, l2GasLimit, gasPerPubdata } = input;
|
|
6365
|
-
const market = await fetchFees(estimator);
|
|
6366
|
-
const l1GasPrice = market.maxFeePerGas || market.maxPriorityFeePerGas || 0n;
|
|
6367
|
-
if (l1GasPrice === 0n) {
|
|
6368
|
-
throw new Error("Could not fetch L1 gas price for Bridgehub base cost calculation.");
|
|
6369
|
-
}
|
|
6380
|
+
const { estimator, encode: encode2, bridgehub, chainIdL2, l2GasLimit, gasPerPubdata, l1GasPrice } = input;
|
|
6370
6381
|
const data = encode2(IBridgehub_default, "l2TransactionBaseCost", [
|
|
6371
6382
|
chainIdL2,
|
|
6372
6383
|
l1GasPrice,
|
|
@@ -6388,8 +6399,9 @@ function toCoreTx(tx) {
|
|
|
6388
6399
|
data: tx.data,
|
|
6389
6400
|
value: tx.value ? BigInt(tx.value) : void 0,
|
|
6390
6401
|
gasLimit: tx.gasLimit ? BigInt(tx.gasLimit) : void 0,
|
|
6391
|
-
|
|
6392
|
-
|
|
6402
|
+
// zero fees are explicit on zero-base-fee chains; dropping them would re-fetch the market tip
|
|
6403
|
+
maxFeePerGas: tx.maxFeePerGas != null ? BigInt(tx.maxFeePerGas) : void 0,
|
|
6404
|
+
maxPriorityFeePerGas: tx.maxPriorityFeePerGas != null ? BigInt(tx.maxPriorityFeePerGas) : void 0
|
|
6393
6405
|
};
|
|
6394
6406
|
}
|
|
6395
6407
|
function ethersToGasEstimator(provider) {
|
|
@@ -6482,7 +6494,7 @@ function createErrorOps(decodeRevert2) {
|
|
|
6482
6494
|
function wrap7(operation, fn, opts) {
|
|
6483
6495
|
return run("INTERNAL", operation, fn, opts);
|
|
6484
6496
|
}
|
|
6485
|
-
function
|
|
6497
|
+
function wrapAs11(kind, operation, fn, opts) {
|
|
6486
6498
|
return run(kind, operation, fn, opts);
|
|
6487
6499
|
}
|
|
6488
6500
|
async function toResult3(operation, fn, opts) {
|
|
@@ -6503,7 +6515,7 @@ function createErrorOps(decodeRevert2) {
|
|
|
6503
6515
|
return { ok: false, error: shaped };
|
|
6504
6516
|
}
|
|
6505
6517
|
}
|
|
6506
|
-
return { wrap: wrap7, wrapAs:
|
|
6518
|
+
return { wrap: wrap7, wrapAs: wrapAs11, toResult: toResult3 };
|
|
6507
6519
|
}
|
|
6508
6520
|
return { toZKsyncError: toZKsyncError2, createErrorHandlers: createErrorHandlers2 };
|
|
6509
6521
|
}
|
|
@@ -6647,7 +6659,7 @@ var encode = (abi2, fn, args) => {
|
|
|
6647
6659
|
return new ethers.Interface(abi2).encodeFunctionData(fn, args);
|
|
6648
6660
|
};
|
|
6649
6661
|
async function quoteL2BaseCost2(input) {
|
|
6650
|
-
const { ctx, l2GasLimit } = input;
|
|
6662
|
+
const { ctx, l2GasLimit, l1GasPrice } = input;
|
|
6651
6663
|
const estimator = ethersToGasEstimator(ctx.client.l1);
|
|
6652
6664
|
return wrapAs(
|
|
6653
6665
|
"RPC",
|
|
@@ -6658,7 +6670,8 @@ async function quoteL2BaseCost2(input) {
|
|
|
6658
6670
|
bridgehub: ctx.bridgehub,
|
|
6659
6671
|
chainIdL2: ctx.chainIdL2,
|
|
6660
6672
|
l2GasLimit,
|
|
6661
|
-
gasPerPubdata: ctx.gasPerPubdata
|
|
6673
|
+
gasPerPubdata: ctx.gasPerPubdata,
|
|
6674
|
+
l1GasPrice
|
|
6662
6675
|
}),
|
|
6663
6676
|
{ ctx: { chainIdL2: ctx.chainIdL2 } }
|
|
6664
6677
|
);
|
|
@@ -6727,6 +6740,7 @@ function resolveRegisteredTokenPriorityL2GasLimit(input) {
|
|
|
6727
6740
|
}
|
|
6728
6741
|
|
|
6729
6742
|
// src/adapters/ethers/resources/deposits/services/gas.ts
|
|
6743
|
+
var { wrapAs: wrapAs2 } = createErrorHandlers("deposits");
|
|
6730
6744
|
var DEFAULT_SAFE_NONBASE_L2_GAS_LIMIT = 3000000n;
|
|
6731
6745
|
var ZERO_L2_TOKEN_ADDRESS = "0x0000000000000000000000000000000000000000";
|
|
6732
6746
|
async function estimatePriorityTxL2Gas(ctx, leg) {
|
|
@@ -6737,6 +6751,18 @@ async function estimatePriorityTxL2Gas(ctx, leg) {
|
|
|
6737
6751
|
return void 0;
|
|
6738
6752
|
}
|
|
6739
6753
|
}
|
|
6754
|
+
async function quoteL1Fees2(input) {
|
|
6755
|
+
const { ctx } = input;
|
|
6756
|
+
return wrapAs2(
|
|
6757
|
+
"RPC",
|
|
6758
|
+
"deposits.fees.l1",
|
|
6759
|
+
() => quoteL1Fees({
|
|
6760
|
+
estimator: ethersToGasEstimator(ctx.client.l1),
|
|
6761
|
+
overrides: ctx.gasOverrides
|
|
6762
|
+
}),
|
|
6763
|
+
{ ctx: { chainIdL2: ctx.chainIdL2 } }
|
|
6764
|
+
);
|
|
6765
|
+
}
|
|
6740
6766
|
async function quoteL1Gas2(input) {
|
|
6741
6767
|
const { ctx, tx, overrides, fallbackGasLimit } = input;
|
|
6742
6768
|
const estimator = ethersToGasEstimator(ctx.client.l1);
|
|
@@ -6936,7 +6962,12 @@ function routeEthDirect() {
|
|
|
6936
6962
|
if (!l2GasParams) {
|
|
6937
6963
|
throw new Error("Failed to estimate L2 gas for deposit.");
|
|
6938
6964
|
}
|
|
6939
|
-
const
|
|
6965
|
+
const l1Fees = await quoteL1Fees2({ ctx });
|
|
6966
|
+
const baseCost = await quoteL2BaseCost2({
|
|
6967
|
+
ctx,
|
|
6968
|
+
l2GasLimit: l2GasParams.gasLimit,
|
|
6969
|
+
l1GasPrice: l1Fees.maxFeePerGas
|
|
6970
|
+
});
|
|
6940
6971
|
const mintValue = baseCost + ctx.operatorTip + l2Value;
|
|
6941
6972
|
const req = buildDirectRequestStruct({
|
|
6942
6973
|
chainId: ctx.chainIdL2,
|
|
@@ -6953,7 +6984,8 @@ function routeEthDirect() {
|
|
|
6953
6984
|
data,
|
|
6954
6985
|
value: mintValue,
|
|
6955
6986
|
from: ctx.sender,
|
|
6956
|
-
...ctx.gasOverrides
|
|
6987
|
+
...ctx.gasOverrides,
|
|
6988
|
+
...l1Fees
|
|
6957
6989
|
};
|
|
6958
6990
|
const l1GasParams = await quoteL1Gas2({
|
|
6959
6991
|
ctx,
|
|
@@ -7008,7 +7040,7 @@ function createNTVCodec(deps) {
|
|
|
7008
7040
|
}
|
|
7009
7041
|
|
|
7010
7042
|
// src/adapters/ethers/resources/deposits/routes/erc20-nonbase.ts
|
|
7011
|
-
var { wrapAs:
|
|
7043
|
+
var { wrapAs: wrapAs3 } = createErrorHandlers("deposits");
|
|
7012
7044
|
var ZERO_L2_TOKEN_ADDRESS2 = "0x0000000000000000000000000000000000000000";
|
|
7013
7045
|
var ZERO_ASSET_ID = "0x0000000000000000000000000000000000000000000000000000000000000000";
|
|
7014
7046
|
var ntvCodec = createNTVCodec({
|
|
@@ -7091,7 +7123,7 @@ function routeErc20NonBase() {
|
|
|
7091
7123
|
async preflight(p, ctx) {
|
|
7092
7124
|
const resolved = ctx.resolvedToken ?? (ctx.tokens ? await ctx.tokens.resolve(p.token, { chain: "l1" }) : void 0);
|
|
7093
7125
|
const baseToken = ctx.baseTokenL1 ?? await ctx.client.baseToken(ctx.chainIdL2);
|
|
7094
|
-
await
|
|
7126
|
+
await wrapAs3(
|
|
7095
7127
|
"VALIDATION",
|
|
7096
7128
|
OP_DEPOSITS.nonbase.assertNonBaseToken,
|
|
7097
7129
|
() => {
|
|
@@ -7107,7 +7139,7 @@ function routeErc20NonBase() {
|
|
|
7107
7139
|
const baseToken = ctx.baseTokenL1 ?? await ctx.client.baseToken(ctx.chainIdL2);
|
|
7108
7140
|
const baseIsEth = ctx.baseIsEth ?? isETH(baseToken);
|
|
7109
7141
|
const receiver = p.to ?? ctx.sender;
|
|
7110
|
-
const secondBridgeCalldata = await
|
|
7142
|
+
const secondBridgeCalldata = await wrapAs3(
|
|
7111
7143
|
"INTERNAL",
|
|
7112
7144
|
OP_DEPOSITS.nonbase.encodeCalldata,
|
|
7113
7145
|
() => encodeSecondBridgeErc20DepositCalldata({
|
|
@@ -7141,14 +7173,19 @@ function routeErc20NonBase() {
|
|
|
7141
7173
|
}
|
|
7142
7174
|
});
|
|
7143
7175
|
if (!l2GasParams) throw new Error("Failed to establish L2 gas parameters.");
|
|
7144
|
-
const
|
|
7176
|
+
const l1Fees = await quoteL1Fees2({ ctx });
|
|
7177
|
+
const baseCost = await quoteL2BaseCost2({
|
|
7178
|
+
ctx,
|
|
7179
|
+
l2GasLimit: l2GasParams.gasLimit,
|
|
7180
|
+
l1GasPrice: l1Fees.maxFeePerGas
|
|
7181
|
+
});
|
|
7145
7182
|
const mintValue = baseCost + ctx.operatorTip;
|
|
7146
7183
|
const approvals = [];
|
|
7147
7184
|
const steps = [];
|
|
7148
7185
|
const assetRouter = ctx.l1AssetRouter;
|
|
7149
7186
|
const nativeTokenVault = ctx.l1NativeTokenVault;
|
|
7150
7187
|
const erc20Deposit = new ethers.Contract(p.token, IERC20_default, l1Signer);
|
|
7151
|
-
const allowanceToken = await
|
|
7188
|
+
const allowanceToken = await wrapAs3(
|
|
7152
7189
|
"RPC",
|
|
7153
7190
|
OP_DEPOSITS.nonbase.allowanceToken,
|
|
7154
7191
|
() => erc20Deposit.allowance(ctx.sender, nativeTokenVault),
|
|
@@ -7176,7 +7213,7 @@ function routeErc20NonBase() {
|
|
|
7176
7213
|
}
|
|
7177
7214
|
if (!baseIsEth) {
|
|
7178
7215
|
const erc20Base = new ethers.Contract(baseToken, IERC20_default, l1Signer);
|
|
7179
|
-
const allowanceBase = await
|
|
7216
|
+
const allowanceBase = await wrapAs3(
|
|
7180
7217
|
"RPC",
|
|
7181
7218
|
OP_DEPOSITS.nonbase.allowanceBase,
|
|
7182
7219
|
() => erc20Base.allowance(ctx.sender, nativeTokenVault),
|
|
@@ -7224,7 +7261,8 @@ function routeErc20NonBase() {
|
|
|
7224
7261
|
data,
|
|
7225
7262
|
value: txValue,
|
|
7226
7263
|
from: ctx.sender,
|
|
7227
|
-
...ctx.gasOverrides
|
|
7264
|
+
...ctx.gasOverrides,
|
|
7265
|
+
...l1Fees
|
|
7228
7266
|
};
|
|
7229
7267
|
const l1GasParams = await quoteL1Gas2({
|
|
7230
7268
|
ctx,
|
|
@@ -7259,13 +7297,27 @@ function routeErc20NonBase() {
|
|
|
7259
7297
|
}
|
|
7260
7298
|
};
|
|
7261
7299
|
}
|
|
7262
|
-
var { wrapAs:
|
|
7300
|
+
var { wrapAs: wrapAs4 } = createErrorHandlers("deposits");
|
|
7263
7301
|
var ZERO_L2_TOKEN_ADDRESS3 = "0x0000000000000000000000000000000000000000";
|
|
7264
7302
|
var ZERO_ASSET_ID2 = "0x0000000000000000000000000000000000000000000000000000000000000000";
|
|
7265
7303
|
var ntvCodec2 = createNTVCodec({
|
|
7266
7304
|
encode: (types, values) => ethers.AbiCoder.defaultAbiCoder().encode(types, values),
|
|
7267
7305
|
keccak256: (data) => ethers.keccak256(data)
|
|
7268
7306
|
});
|
|
7307
|
+
async function encodeSecondBridgeEthDepositCalldata(input) {
|
|
7308
|
+
const registeredAssetId = input.ctx.resolvedToken?.assetId;
|
|
7309
|
+
const assetId = registeredAssetId && registeredAssetId.toLowerCase() !== ZERO_ASSET_ID2 ? registeredAssetId : ntvCodec2.encodeAssetId(
|
|
7310
|
+
BigInt((await input.ctx.client.l1.getNetwork()).chainId),
|
|
7311
|
+
L2_NATIVE_TOKEN_VAULT_ADDRESS,
|
|
7312
|
+
ETH_ADDRESS
|
|
7313
|
+
);
|
|
7314
|
+
const transferData = encodeNativeTokenVaultTransferData(
|
|
7315
|
+
input.amount,
|
|
7316
|
+
input.receiver,
|
|
7317
|
+
ETH_ADDRESS
|
|
7318
|
+
);
|
|
7319
|
+
return encodeSecondBridgeDataV1(assetId, transferData);
|
|
7320
|
+
}
|
|
7269
7321
|
async function getPriorityGasModel2(input) {
|
|
7270
7322
|
try {
|
|
7271
7323
|
const l1AssetRouter = await input.ctx.contracts.l1AssetRouter();
|
|
@@ -7321,7 +7373,7 @@ function routeEthNonBase() {
|
|
|
7321
7373
|
return {
|
|
7322
7374
|
async preflight(p, ctx) {
|
|
7323
7375
|
const resolved = ctx.resolvedToken ?? (ctx.tokens ? await ctx.tokens.resolve(p.token, { chain: "l1" }) : void 0);
|
|
7324
|
-
await
|
|
7376
|
+
await wrapAs4(
|
|
7325
7377
|
"VALIDATION",
|
|
7326
7378
|
OP_DEPOSITS.ethNonBase.assertEthAsset,
|
|
7327
7379
|
() => {
|
|
@@ -7331,7 +7383,7 @@ function routeEthNonBase() {
|
|
|
7331
7383
|
},
|
|
7332
7384
|
{ ctx: { token: p.token } }
|
|
7333
7385
|
);
|
|
7334
|
-
await
|
|
7386
|
+
await wrapAs4(
|
|
7335
7387
|
"VALIDATION",
|
|
7336
7388
|
OP_DEPOSITS.ethNonBase.assertNonEthBase,
|
|
7337
7389
|
() => {
|
|
@@ -7341,7 +7393,7 @@ function routeEthNonBase() {
|
|
|
7341
7393
|
},
|
|
7342
7394
|
{ ctx: { baseIsEth: ctx.baseIsEth, chainIdL2: ctx.chainIdL2 } }
|
|
7343
7395
|
);
|
|
7344
|
-
const ethBal = await
|
|
7396
|
+
const ethBal = await wrapAs4(
|
|
7345
7397
|
"RPC",
|
|
7346
7398
|
OP_DEPOSITS.ethNonBase.ethBalance,
|
|
7347
7399
|
() => ctx.client.l1.getBalance(ctx.sender),
|
|
@@ -7350,7 +7402,7 @@ function routeEthNonBase() {
|
|
|
7350
7402
|
message: "Failed to read L1 ETH balance."
|
|
7351
7403
|
}
|
|
7352
7404
|
);
|
|
7353
|
-
await
|
|
7405
|
+
await wrapAs4(
|
|
7354
7406
|
"VALIDATION",
|
|
7355
7407
|
OP_DEPOSITS.ethNonBase.assertEthBalance,
|
|
7356
7408
|
() => {
|
|
@@ -7385,12 +7437,17 @@ function routeEthNonBase() {
|
|
|
7385
7437
|
undeployedGasLimit: priorityGasModel.undeployedGasLimit
|
|
7386
7438
|
});
|
|
7387
7439
|
if (!l2GasParams) throw new Error("Failed to estimate L2 gas parameters.");
|
|
7388
|
-
const
|
|
7440
|
+
const l1Fees = await quoteL1Fees2({ ctx });
|
|
7441
|
+
const baseCost = await quoteL2BaseCost2({
|
|
7442
|
+
ctx,
|
|
7443
|
+
l2GasLimit: l2GasParams.gasLimit,
|
|
7444
|
+
l1GasPrice: l1Fees.maxFeePerGas
|
|
7445
|
+
});
|
|
7389
7446
|
const mintValue = baseCost + ctx.operatorTip;
|
|
7390
7447
|
const approvals = [];
|
|
7391
7448
|
const steps = [];
|
|
7392
7449
|
const erc20Base = new ethers.Contract(baseToken, IERC20_default, l1Signer);
|
|
7393
|
-
const allowance = await
|
|
7450
|
+
const allowance = await wrapAs4(
|
|
7394
7451
|
"RPC",
|
|
7395
7452
|
OP_DEPOSITS.ethNonBase.allowanceBase,
|
|
7396
7453
|
() => erc20Base.allowance(ctx.sender, ctx.l1NativeTokenVault),
|
|
@@ -7416,13 +7473,13 @@ function routeEthNonBase() {
|
|
|
7416
7473
|
}
|
|
7417
7474
|
});
|
|
7418
7475
|
}
|
|
7419
|
-
const secondBridgeCalldata = await
|
|
7476
|
+
const secondBridgeCalldata = await wrapAs4(
|
|
7420
7477
|
"INTERNAL",
|
|
7421
7478
|
OP_DEPOSITS.ethNonBase.encodeCalldata,
|
|
7422
|
-
() =>
|
|
7479
|
+
() => encodeSecondBridgeEthDepositCalldata({ ctx, amount: p.amount, receiver }),
|
|
7423
7480
|
{
|
|
7424
7481
|
ctx: {
|
|
7425
|
-
where: "
|
|
7482
|
+
where: "encodeSecondBridgeEthDepositCalldata",
|
|
7426
7483
|
amount: p.amount.toString(),
|
|
7427
7484
|
to: receiver
|
|
7428
7485
|
}
|
|
@@ -7449,7 +7506,8 @@ function routeEthNonBase() {
|
|
|
7449
7506
|
data,
|
|
7450
7507
|
value: bridgehubValue,
|
|
7451
7508
|
from: ctx.sender,
|
|
7452
|
-
...ctx.gasOverrides
|
|
7509
|
+
...ctx.gasOverrides,
|
|
7510
|
+
...l1Fees
|
|
7453
7511
|
};
|
|
7454
7512
|
const l1GasParams = await quoteL1Gas2({
|
|
7455
7513
|
ctx,
|
|
@@ -7484,13 +7542,13 @@ function routeEthNonBase() {
|
|
|
7484
7542
|
}
|
|
7485
7543
|
};
|
|
7486
7544
|
}
|
|
7487
|
-
var { wrapAs:
|
|
7545
|
+
var { wrapAs: wrapAs5 } = createErrorHandlers("deposits");
|
|
7488
7546
|
var EMPTY_BYTES3 = "0x";
|
|
7489
7547
|
function routeErc20Base() {
|
|
7490
7548
|
return {
|
|
7491
7549
|
async preflight(p, ctx) {
|
|
7492
7550
|
const resolved = ctx.resolvedToken ?? (ctx.tokens ? await ctx.tokens.resolve(p.token, { chain: "l1" }) : void 0);
|
|
7493
|
-
await
|
|
7551
|
+
await wrapAs5(
|
|
7494
7552
|
"VALIDATION",
|
|
7495
7553
|
OP_DEPOSITS.base.assertErc20Asset,
|
|
7496
7554
|
() => {
|
|
@@ -7501,7 +7559,7 @@ function routeErc20Base() {
|
|
|
7501
7559
|
{ ctx: { token: p.token } }
|
|
7502
7560
|
);
|
|
7503
7561
|
const baseToken = ctx.baseTokenL1 ?? await ctx.client.baseToken(ctx.chainIdL2);
|
|
7504
|
-
await
|
|
7562
|
+
await wrapAs5(
|
|
7505
7563
|
"VALIDATION",
|
|
7506
7564
|
OP_DEPOSITS.base.assertMatchesBase,
|
|
7507
7565
|
() => {
|
|
@@ -7540,13 +7598,18 @@ function routeErc20Base() {
|
|
|
7540
7598
|
overrideGasLimit: quotedL2GasLimit
|
|
7541
7599
|
});
|
|
7542
7600
|
if (!l2GasParams) throw new Error("Failed to estimate L2 gas parameters.");
|
|
7543
|
-
const
|
|
7601
|
+
const l1Fees = await quoteL1Fees2({ ctx });
|
|
7602
|
+
const baseCost = await quoteL2BaseCost2({
|
|
7603
|
+
ctx,
|
|
7604
|
+
l2GasLimit: l2GasParams.gasLimit,
|
|
7605
|
+
l1GasPrice: l1Fees.maxFeePerGas
|
|
7606
|
+
});
|
|
7544
7607
|
const mintValue = baseCost + ctx.operatorTip + p.amount;
|
|
7545
7608
|
const approvals = [];
|
|
7546
7609
|
const steps = [];
|
|
7547
7610
|
{
|
|
7548
7611
|
const erc20 = new ethers.Contract(baseToken, IERC20_default, l1Signer);
|
|
7549
|
-
const allowance = await
|
|
7612
|
+
const allowance = await wrapAs5(
|
|
7550
7613
|
"RPC",
|
|
7551
7614
|
OP_DEPOSITS.base.allowance,
|
|
7552
7615
|
() => erc20.allowance(ctx.sender, ctx.l1NativeTokenVault),
|
|
@@ -7592,7 +7655,8 @@ function routeErc20Base() {
|
|
|
7592
7655
|
value: 0n,
|
|
7593
7656
|
// base token is ERC-20 ⇒ msg.value MUST be 0
|
|
7594
7657
|
from: ctx.sender,
|
|
7595
|
-
...ctx.gasOverrides
|
|
7658
|
+
...ctx.gasOverrides,
|
|
7659
|
+
...l1Fees
|
|
7596
7660
|
};
|
|
7597
7661
|
const l1GasParams = await quoteL1Gas2({
|
|
7598
7662
|
ctx,
|
|
@@ -7627,7 +7691,7 @@ function routeErc20Base() {
|
|
|
7627
7691
|
}
|
|
7628
7692
|
};
|
|
7629
7693
|
}
|
|
7630
|
-
var { wrapAs:
|
|
7694
|
+
var { wrapAs: wrapAs6 } = createErrorHandlers("tokens");
|
|
7631
7695
|
var abi = ethers.AbiCoder.defaultAbiCoder();
|
|
7632
7696
|
var ntvCodec3 = createNTVCodec({
|
|
7633
7697
|
encode: (types, values) => abi.encode(types, values),
|
|
@@ -7640,7 +7704,7 @@ function createTokensResource(client) {
|
|
|
7640
7704
|
let wethL2Promise = null;
|
|
7641
7705
|
async function getL1ChainId() {
|
|
7642
7706
|
if (!l2NtvL1ChainIdPromise) {
|
|
7643
|
-
l2NtvL1ChainIdPromise =
|
|
7707
|
+
l2NtvL1ChainIdPromise = wrapAs6("INTERNAL", "getL1ChainId", async () => {
|
|
7644
7708
|
const { l2NativeTokenVault } = await client.contracts();
|
|
7645
7709
|
const chainId = await l2NativeTokenVault.L1_CHAIN_ID();
|
|
7646
7710
|
return chainId;
|
|
@@ -7650,7 +7714,7 @@ function createTokensResource(client) {
|
|
|
7650
7714
|
}
|
|
7651
7715
|
async function getBaseTokenAssetId() {
|
|
7652
7716
|
if (!baseTokenAssetIdPromise) {
|
|
7653
|
-
baseTokenAssetIdPromise =
|
|
7717
|
+
baseTokenAssetIdPromise = wrapAs6("INTERNAL", "baseTokenAssetId", async () => {
|
|
7654
7718
|
const { l2NativeTokenVault } = await client.contracts();
|
|
7655
7719
|
const assetId = await l2NativeTokenVault.BASE_TOKEN_ASSET_ID();
|
|
7656
7720
|
return assetId;
|
|
@@ -7660,7 +7724,7 @@ function createTokensResource(client) {
|
|
|
7660
7724
|
}
|
|
7661
7725
|
async function getWethL1() {
|
|
7662
7726
|
if (!wethL1Promise) {
|
|
7663
|
-
wethL1Promise =
|
|
7727
|
+
wethL1Promise = wrapAs6("INTERNAL", "wethL1", async () => {
|
|
7664
7728
|
const { l1NativeTokenVault } = await client.contracts();
|
|
7665
7729
|
const weth = await l1NativeTokenVault.WETH_TOKEN();
|
|
7666
7730
|
return weth;
|
|
@@ -7670,7 +7734,7 @@ function createTokensResource(client) {
|
|
|
7670
7734
|
}
|
|
7671
7735
|
async function getWethL2() {
|
|
7672
7736
|
if (!wethL2Promise) {
|
|
7673
|
-
wethL2Promise =
|
|
7737
|
+
wethL2Promise = wrapAs6("INTERNAL", "wethL2", async () => {
|
|
7674
7738
|
const { l2NativeTokenVault } = await client.contracts();
|
|
7675
7739
|
const weth = await l2NativeTokenVault.WETH_TOKEN();
|
|
7676
7740
|
return weth;
|
|
@@ -7679,7 +7743,7 @@ function createTokensResource(client) {
|
|
|
7679
7743
|
return wethL2Promise;
|
|
7680
7744
|
}
|
|
7681
7745
|
async function toL2Address(l1Token) {
|
|
7682
|
-
return
|
|
7746
|
+
return wrapAs6("CONTRACT", "tokens.toL2Address", async () => {
|
|
7683
7747
|
const normalized = normalizeL1Token(l1Token);
|
|
7684
7748
|
const { chainId } = await client.l2.getNetwork();
|
|
7685
7749
|
const baseToken = await client.baseToken(BigInt(chainId));
|
|
@@ -7692,7 +7756,7 @@ function createTokensResource(client) {
|
|
|
7692
7756
|
});
|
|
7693
7757
|
}
|
|
7694
7758
|
async function toL1Address(l2Token) {
|
|
7695
|
-
return
|
|
7759
|
+
return wrapAs6("CONTRACT", "tokens.toL1Address", async () => {
|
|
7696
7760
|
if (isAddressEq(l2Token, ETH_ADDRESS)) {
|
|
7697
7761
|
return ETH_ADDRESS;
|
|
7698
7762
|
}
|
|
@@ -7715,7 +7779,7 @@ function createTokensResource(client) {
|
|
|
7715
7779
|
});
|
|
7716
7780
|
}
|
|
7717
7781
|
async function assetIdOfL1(l1Token) {
|
|
7718
|
-
return
|
|
7782
|
+
return wrapAs6("CONTRACT", "tokens.assetIdOfL1", async () => {
|
|
7719
7783
|
const normalized = normalizeL1Token(l1Token);
|
|
7720
7784
|
const { l1NativeTokenVault } = await client.contracts();
|
|
7721
7785
|
const assetId = await l1NativeTokenVault.assetId(normalized);
|
|
@@ -7723,28 +7787,28 @@ function createTokensResource(client) {
|
|
|
7723
7787
|
});
|
|
7724
7788
|
}
|
|
7725
7789
|
async function assetIdOfL2(l2Token) {
|
|
7726
|
-
return
|
|
7790
|
+
return wrapAs6("CONTRACT", "tokens.assetIdOfL2", async () => {
|
|
7727
7791
|
const { l2NativeTokenVault } = await client.contracts();
|
|
7728
7792
|
const assetId = await l2NativeTokenVault.assetId(l2Token);
|
|
7729
7793
|
return assetId;
|
|
7730
7794
|
});
|
|
7731
7795
|
}
|
|
7732
7796
|
async function l2TokenFromAssetId(assetId) {
|
|
7733
|
-
return
|
|
7797
|
+
return wrapAs6("CONTRACT", "tokens.l2TokenFromAssetId", async () => {
|
|
7734
7798
|
const { l2NativeTokenVault } = await client.contracts();
|
|
7735
7799
|
const tokenAddr = await l2NativeTokenVault.tokenAddress(assetId);
|
|
7736
7800
|
return tokenAddr;
|
|
7737
7801
|
});
|
|
7738
7802
|
}
|
|
7739
7803
|
async function l1TokenFromAssetId(assetId) {
|
|
7740
|
-
return
|
|
7804
|
+
return wrapAs6("CONTRACT", "tokens.l1TokenFromAssetId", async () => {
|
|
7741
7805
|
const { l1NativeTokenVault } = await client.contracts();
|
|
7742
7806
|
const tokenAddr = await l1NativeTokenVault.tokenAddress(assetId);
|
|
7743
7807
|
return tokenAddr;
|
|
7744
7808
|
});
|
|
7745
7809
|
}
|
|
7746
7810
|
async function originChainId(assetId) {
|
|
7747
|
-
return
|
|
7811
|
+
return wrapAs6("CONTRACT", "tokens.originChainId", async () => {
|
|
7748
7812
|
const { l2NativeTokenVault } = await client.contracts();
|
|
7749
7813
|
const chainId = await l2NativeTokenVault.originChainId(assetId);
|
|
7750
7814
|
return chainId;
|
|
@@ -7754,7 +7818,7 @@ function createTokensResource(client) {
|
|
|
7754
7818
|
return getBaseTokenAssetId();
|
|
7755
7819
|
}
|
|
7756
7820
|
async function isChainEthBased() {
|
|
7757
|
-
return
|
|
7821
|
+
return wrapAs6("CONTRACT", "tokens.isChainEthBased", async () => {
|
|
7758
7822
|
const baseAssetId = await getBaseTokenAssetId();
|
|
7759
7823
|
const l1ChainId = await getL1ChainId();
|
|
7760
7824
|
const ethAssetId = ntvCodec3.encodeAssetId(
|
|
@@ -7772,7 +7836,7 @@ function createTokensResource(client) {
|
|
|
7772
7836
|
return getWethL2();
|
|
7773
7837
|
}
|
|
7774
7838
|
async function computeL2BridgedAddress(args) {
|
|
7775
|
-
return
|
|
7839
|
+
return wrapAs6("CONTRACT", "tokens.computeL2BridgedAddress", async () => {
|
|
7776
7840
|
const normalized = normalizeL1Token(args.l1Token);
|
|
7777
7841
|
const { l2NativeTokenVault } = await client.contracts();
|
|
7778
7842
|
const predicted = await l2NativeTokenVault.calculateCreate2TokenAddress(
|
|
@@ -7783,7 +7847,7 @@ function createTokensResource(client) {
|
|
|
7783
7847
|
});
|
|
7784
7848
|
}
|
|
7785
7849
|
async function resolve(ref, opts) {
|
|
7786
|
-
return
|
|
7850
|
+
return wrapAs6("CONTRACT", "tokens.resolve", async () => {
|
|
7787
7851
|
let chain;
|
|
7788
7852
|
let address;
|
|
7789
7853
|
if (typeof ref === "string") {
|
|
@@ -8350,13 +8414,13 @@ function buildFeeBreakdown2(p) {
|
|
|
8350
8414
|
}
|
|
8351
8415
|
|
|
8352
8416
|
// src/adapters/ethers/resources/withdrawals/routes/eth.ts
|
|
8353
|
-
var { wrapAs:
|
|
8417
|
+
var { wrapAs: wrapAs7 } = createErrorHandlers("withdrawals");
|
|
8354
8418
|
function routeEthBase() {
|
|
8355
8419
|
return {
|
|
8356
8420
|
async build(p, ctx) {
|
|
8357
8421
|
const steps = [];
|
|
8358
8422
|
const base = await ctx.contracts.l2BaseTokenSystem();
|
|
8359
|
-
const data = await
|
|
8423
|
+
const data = await wrapAs7(
|
|
8360
8424
|
"INTERNAL",
|
|
8361
8425
|
OP_WITHDRAWALS.eth.encodeWithdraw,
|
|
8362
8426
|
() => Promise.resolve(base.interface.encodeFunctionData("withdraw", [p.to ?? ctx.sender])),
|
|
@@ -8391,7 +8455,7 @@ function routeEthBase() {
|
|
|
8391
8455
|
}
|
|
8392
8456
|
};
|
|
8393
8457
|
}
|
|
8394
|
-
var { wrapAs:
|
|
8458
|
+
var { wrapAs: wrapAs8 } = createErrorHandlers("withdrawals");
|
|
8395
8459
|
var SIG = {
|
|
8396
8460
|
withdraw: "withdraw(bytes32,bytes)"
|
|
8397
8461
|
};
|
|
@@ -8401,7 +8465,7 @@ function routeErc20NonBase2() {
|
|
|
8401
8465
|
const steps = [];
|
|
8402
8466
|
const approvals = [];
|
|
8403
8467
|
const erc20 = new ethers.Contract(p.token, IERC20_default, ctx.client.l2);
|
|
8404
|
-
const current = await
|
|
8468
|
+
const current = await wrapAs8(
|
|
8405
8469
|
"CONTRACT",
|
|
8406
8470
|
OP_WITHDRAWALS.erc20.allowance,
|
|
8407
8471
|
() => erc20.allowance(ctx.sender, ctx.l2NativeTokenVault),
|
|
@@ -8439,7 +8503,7 @@ function routeErc20NonBase2() {
|
|
|
8439
8503
|
tx: approveTx
|
|
8440
8504
|
});
|
|
8441
8505
|
}
|
|
8442
|
-
const assetId = await
|
|
8506
|
+
const assetId = await wrapAs8(
|
|
8443
8507
|
"CONTRACT",
|
|
8444
8508
|
OP_WITHDRAWALS.erc20.ensureRegistered,
|
|
8445
8509
|
async () => {
|
|
@@ -8452,7 +8516,7 @@ function routeErc20NonBase2() {
|
|
|
8452
8516
|
message: "Failed to ensure token is registered in L2NativeTokenVault."
|
|
8453
8517
|
}
|
|
8454
8518
|
);
|
|
8455
|
-
const assetData = await
|
|
8519
|
+
const assetData = await wrapAs8(
|
|
8456
8520
|
"INTERNAL",
|
|
8457
8521
|
OP_WITHDRAWALS.erc20.encodeAssetData,
|
|
8458
8522
|
() => Promise.resolve(
|
|
@@ -8464,7 +8528,7 @@ function routeErc20NonBase2() {
|
|
|
8464
8528
|
}
|
|
8465
8529
|
);
|
|
8466
8530
|
const l2ar = await ctx.contracts.l2AssetRouter();
|
|
8467
|
-
const dataWithdraw = await
|
|
8531
|
+
const dataWithdraw = await wrapAs8(
|
|
8468
8532
|
"INTERNAL",
|
|
8469
8533
|
OP_WITHDRAWALS.erc20.encodeWithdraw,
|
|
8470
8534
|
() => Promise.resolve(l2ar.interface.encodeFunctionData(SIG.withdraw, [assetId, assetData])),
|
|
@@ -8621,7 +8685,7 @@ function buildWithdrawalBundle(input) {
|
|
|
8621
8685
|
}
|
|
8622
8686
|
|
|
8623
8687
|
// src/adapters/ethers/resources/withdrawals/routes/interop-bundle.ts
|
|
8624
|
-
var { wrapAs:
|
|
8688
|
+
var { wrapAs: wrapAs9 } = createErrorHandlers("withdrawals");
|
|
8625
8689
|
var attributes = createEthersAttributesResource();
|
|
8626
8690
|
function saltFor(sender, nonce) {
|
|
8627
8691
|
return ethers.keccak256(
|
|
@@ -8640,7 +8704,7 @@ function routeInteropBundle() {
|
|
|
8640
8704
|
if (isBaseToken) {
|
|
8641
8705
|
assetId = ctx.baseTokenAssetId;
|
|
8642
8706
|
} else {
|
|
8643
|
-
assetId = await
|
|
8707
|
+
assetId = await wrapAs9(
|
|
8644
8708
|
"CONTRACT",
|
|
8645
8709
|
OP_WITHDRAWALS.erc20.ensureRegistered,
|
|
8646
8710
|
async () => {
|
|
@@ -8653,7 +8717,7 @@ function routeInteropBundle() {
|
|
|
8653
8717
|
}
|
|
8654
8718
|
);
|
|
8655
8719
|
const erc20 = new ethers.Contract(p.token, IERC20_default, ctx.client.l2);
|
|
8656
|
-
const current = await
|
|
8720
|
+
const current = await wrapAs9(
|
|
8657
8721
|
"CONTRACT",
|
|
8658
8722
|
OP_WITHDRAWALS.erc20.allowance,
|
|
8659
8723
|
() => erc20.allowance(ctx.sender, ctx.l2NativeTokenVault),
|
|
@@ -8689,7 +8753,7 @@ function routeInteropBundle() {
|
|
|
8689
8753
|
});
|
|
8690
8754
|
}
|
|
8691
8755
|
}
|
|
8692
|
-
const nonce = await
|
|
8756
|
+
const nonce = await wrapAs9(
|
|
8693
8757
|
"RPC",
|
|
8694
8758
|
OP_WITHDRAWALS.prepare,
|
|
8695
8759
|
() => ctx.client.l2.getTransactionCount(ctx.sender, "pending"),
|
|
@@ -8719,7 +8783,7 @@ function routeInteropBundle() {
|
|
|
8719
8783
|
}
|
|
8720
8784
|
});
|
|
8721
8785
|
const interopCenter = await ctx.contracts.interopCenter();
|
|
8722
|
-
const data = await
|
|
8786
|
+
const data = await wrapAs9(
|
|
8723
8787
|
"INTERNAL",
|
|
8724
8788
|
OP_WITHDRAWALS.erc20.encodeWithdraw,
|
|
8725
8789
|
() => Promise.resolve(
|
|
@@ -8934,7 +8998,7 @@ function createWithdrawalProtocolService(client, override) {
|
|
|
8934
8998
|
}
|
|
8935
8999
|
|
|
8936
9000
|
// src/adapters/ethers/resources/withdrawals/services/finalization.ts
|
|
8937
|
-
var { wrapAs:
|
|
9001
|
+
var { wrapAs: wrapAs10 } = createErrorHandlers("withdrawals");
|
|
8938
9002
|
var IL1NullifierMini = [
|
|
8939
9003
|
"function isWithdrawalFinalized(uint256,uint256,uint256) view returns (bool)"
|
|
8940
9004
|
];
|
|
@@ -8944,7 +9008,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
|
|
|
8944
9008
|
const { l1Nullifier } = await client.ensureAddresses();
|
|
8945
9009
|
if (protocol === "legacy-withdrawal") return l1Nullifier;
|
|
8946
9010
|
const nullifier = new ethers.Contract(l1Nullifier, IL1NullifierV32_default, l1);
|
|
8947
|
-
const handler = await
|
|
9011
|
+
const handler = await wrapAs10(
|
|
8948
9012
|
"CONTRACT",
|
|
8949
9013
|
OP_WITHDRAWALS.finalize.fetchParams.receipt,
|
|
8950
9014
|
() => nullifier.l1InteropHandler(),
|
|
@@ -8956,7 +9020,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
|
|
|
8956
9020
|
return handler;
|
|
8957
9021
|
}
|
|
8958
9022
|
async function fetchMessageAndProof(l2TxHash) {
|
|
8959
|
-
const raw = await
|
|
9023
|
+
const raw = await wrapAs10(
|
|
8960
9024
|
"RPC",
|
|
8961
9025
|
OP_WITHDRAWALS.finalize.fetchParams.receipt,
|
|
8962
9026
|
() => client.zks.getReceiptWithL2ToL1(l2TxHash),
|
|
@@ -8973,7 +9037,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
|
|
|
8973
9037
|
context: { l2TxHash }
|
|
8974
9038
|
});
|
|
8975
9039
|
}
|
|
8976
|
-
const ev = await
|
|
9040
|
+
const ev = await wrapAs10(
|
|
8977
9041
|
"INTERNAL",
|
|
8978
9042
|
OP_WITHDRAWALS.finalize.fetchParams.findMessage,
|
|
8979
9043
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-explicit-any
|
|
@@ -8983,7 +9047,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
|
|
|
8983
9047
|
message: "Failed to locate L1MessageSent event in L2 receipt."
|
|
8984
9048
|
}
|
|
8985
9049
|
);
|
|
8986
|
-
const message = await
|
|
9050
|
+
const message = await wrapAs10(
|
|
8987
9051
|
"INTERNAL",
|
|
8988
9052
|
OP_WITHDRAWALS.finalize.fetchParams.decodeMessage,
|
|
8989
9053
|
() => Promise.resolve(ethers.AbiCoder.defaultAbiCoder().decode(["bytes"], ev.data)[0]),
|
|
@@ -8992,7 +9056,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
|
|
|
8992
9056
|
message: "Failed to decode withdrawal message."
|
|
8993
9057
|
}
|
|
8994
9058
|
);
|
|
8995
|
-
const idx = await
|
|
9059
|
+
const idx = await wrapAs10(
|
|
8996
9060
|
"INTERNAL",
|
|
8997
9061
|
OP_WITHDRAWALS.finalize.fetchParams.messengerIndex,
|
|
8998
9062
|
() => Promise.resolve(messengerLogIndex(raw, { index: 0, messenger: L1_MESSENGER_ADDRESS })),
|
|
@@ -9001,7 +9065,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
|
|
|
9001
9065
|
message: "Failed to derive messenger log index."
|
|
9002
9066
|
}
|
|
9003
9067
|
);
|
|
9004
|
-
const proof = await
|
|
9068
|
+
const proof = await wrapAs10(
|
|
9005
9069
|
"RPC",
|
|
9006
9070
|
OP_WITHDRAWALS.finalize.fetchParams.proof,
|
|
9007
9071
|
() => client.zks.getL2ToL1LogProof(l2TxHash, idx),
|
|
@@ -9010,7 +9074,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
|
|
|
9010
9074
|
message: "Failed to fetch L2\u2192L1 log proof."
|
|
9011
9075
|
}
|
|
9012
9076
|
);
|
|
9013
|
-
const { chainId } = await
|
|
9077
|
+
const { chainId } = await wrapAs10(
|
|
9014
9078
|
"RPC",
|
|
9015
9079
|
OP_WITHDRAWALS.finalize.fetchParams.network,
|
|
9016
9080
|
() => l2.getNetwork(),
|
|
@@ -9069,7 +9133,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
|
|
|
9069
9133
|
const target = await finalizationTarget(finalization.protocol);
|
|
9070
9134
|
if (finalization.protocol === "legacy-withdrawal") {
|
|
9071
9135
|
const c = new ethers.Contract(target, IL1NullifierMini, l1);
|
|
9072
|
-
const done = await
|
|
9136
|
+
const done = await wrapAs10(
|
|
9073
9137
|
"RPC",
|
|
9074
9138
|
OP_WITHDRAWALS.finalize.isFinalized,
|
|
9075
9139
|
() => c.isWithdrawalFinalized(
|
|
@@ -9087,7 +9151,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
|
|
|
9087
9151
|
const { bundleHash } = finalization.params;
|
|
9088
9152
|
const handler = new ethers.Contract(target, IInteropHandler_default, l1);
|
|
9089
9153
|
const status = Number(
|
|
9090
|
-
await
|
|
9154
|
+
await wrapAs10(
|
|
9091
9155
|
"RPC",
|
|
9092
9156
|
OP_WITHDRAWALS.finalize.isFinalized,
|
|
9093
9157
|
() => handler.bundleStatus(bundleHash),
|
|
@@ -9099,7 +9163,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
|
|
|
9099
9163
|
);
|
|
9100
9164
|
if (status !== 3 /* Unbundled */) return classifyWithdrawalOutcome(status);
|
|
9101
9165
|
const callStatus = Number(
|
|
9102
|
-
await
|
|
9166
|
+
await wrapAs10(
|
|
9103
9167
|
"RPC",
|
|
9104
9168
|
OP_WITHDRAWALS.finalize.isFinalized,
|
|
9105
9169
|
() => handler.callStatus(bundleHash, 0),
|
|
@@ -9159,7 +9223,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
|
|
|
9159
9223
|
async estimateFinalization(finalization) {
|
|
9160
9224
|
const target = await finalizationTarget(finalization.protocol);
|
|
9161
9225
|
const l1Signer = client.getL1Signer();
|
|
9162
|
-
const gasLimit = await
|
|
9226
|
+
const gasLimit = await wrapAs10(
|
|
9163
9227
|
"RPC",
|
|
9164
9228
|
OP_WITHDRAWALS.finalize.estimate,
|
|
9165
9229
|
() => {
|
|
@@ -9178,7 +9242,7 @@ function createFinalizationServices(client, protocolService = createWithdrawalPr
|
|
|
9178
9242
|
message: "Failed to estimate gas for withdrawal finalization."
|
|
9179
9243
|
}
|
|
9180
9244
|
);
|
|
9181
|
-
const feeData = await
|
|
9245
|
+
const feeData = await wrapAs10("RPC", OP_WITHDRAWALS.finalize.estimate, () => l1.getFeeData(), {
|
|
9182
9246
|
ctx: { where: "l1.getFeeData" },
|
|
9183
9247
|
message: "Failed to estimate fee data for withdrawal finalization."
|
|
9184
9248
|
});
|