@matterlabs/zksync-js 0.0.22 → 0.0.24
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.cjs +0 -7
- package/dist/adapters/ethers/client.cjs.map +1 -1
- package/dist/adapters/ethers/client.js +5 -5
- package/dist/adapters/ethers/index.cjs +202 -93
- package/dist/adapters/ethers/index.cjs.map +1 -1
- package/dist/adapters/ethers/index.js +9 -9
- package/dist/adapters/ethers/resources/deposits/context.d.ts +2 -0
- package/dist/adapters/ethers/resources/deposits/services/gas.d.ts +3 -0
- package/dist/adapters/ethers/sdk.cjs +202 -105
- package/dist/adapters/ethers/sdk.cjs.map +1 -1
- package/dist/adapters/ethers/sdk.js +8 -8
- package/dist/adapters/viem/client.cjs +0 -7
- package/dist/adapters/viem/client.cjs.map +1 -1
- package/dist/adapters/viem/client.js +5 -5
- package/dist/adapters/viem/index.cjs +194 -92
- package/dist/adapters/viem/index.cjs.map +1 -1
- package/dist/adapters/viem/index.js +9 -9
- package/dist/adapters/viem/resources/deposits/context.d.ts +2 -0
- package/dist/adapters/viem/resources/deposits/services/gas.d.ts +3 -0
- package/dist/adapters/viem/sdk.cjs +194 -108
- package/dist/adapters/viem/sdk.cjs.map +1 -1
- package/dist/adapters/viem/sdk.js +8 -8
- package/dist/{chunk-NQRYXL3K.js → chunk-3IPSDGHO.js} +17 -1
- package/dist/{chunk-KL6ZCPWJ.js → chunk-4ZANKNIK.js} +1 -1
- package/dist/{chunk-3SPDWWRD.js → chunk-5S63J6DW.js} +60 -32
- package/dist/{chunk-CP4SQ5PM.js → chunk-B6P24GL5.js} +137 -57
- package/dist/{chunk-QUAPG3ZR.js → chunk-BQ2YCWV2.js} +2 -2
- package/dist/{chunk-2D3FBCZC.js → chunk-H5A6GU3D.js} +2 -2
- package/dist/{chunk-AMRHBZIY.js → chunk-JNS4XZE2.js} +2 -9
- package/dist/{chunk-32N6TI6K.js → chunk-OEUDZFXH.js} +1 -1
- package/dist/{chunk-PI4PF6WT.js → chunk-PNTR5FTL.js} +3 -3
- package/dist/{chunk-4K4LOCQJ.js → chunk-QMMFUWRV.js} +129 -56
- package/dist/{chunk-CPNHKNI4.js → chunk-RZH7HBH3.js} +2 -2
- package/dist/{chunk-JXBLQQEN.js → chunk-YEA74D2L.js} +3 -3
- package/dist/{chunk-CUBUD4J4.js → chunk-YGXEIOK6.js} +1 -1
- package/dist/core/adapters/interfaces.d.ts +2 -0
- package/dist/core/constants.cjs +16 -0
- package/dist/core/constants.cjs.map +1 -1
- package/dist/core/constants.d.ts +8 -0
- package/dist/core/constants.js +1 -1
- package/dist/core/index.cjs +0 -7
- package/dist/core/index.cjs.map +1 -1
- package/dist/core/index.js +5 -5
- package/dist/core/internal/abis/IL2AssetRouter.d.ts +0 -14
- package/dist/core/resources/deposits/priority.d.ts +30 -0
- package/dist/core/types/errors.d.ts +1 -1
- package/dist/index.cjs +16 -7
- package/dist/index.cjs.map +1 -1
- package/dist/index.js +4 -4
- package/package.json +1 -1
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
export { createEthersClient as createClient, createEthersClient } from '../../chunk-
|
|
2
|
-
export { buildDirectRequestStruct, createDepositsResource, createEthersSdk, createFinalizationServices, createInteropFinalizationServices, createInteropResource, createTokensResource, createWithdrawalProtocolService, createWithdrawalsResource, encodeNativeTokenVaultTransferData, encodeSecondBridgeArgs, encodeSecondBridgeDataV1, encodeSecondBridgeErc20Args, encodeSecondBridgeEthArgs, getL2TransactionHashFromLogs } from '../../chunk-
|
|
3
|
-
export { classifyReadinessFromRevert, createErrorHandlers, decodeRevert, registerErrorAbi, toZKsyncError } from '../../chunk-
|
|
4
|
-
import '../../chunk-
|
|
5
|
-
import '../../chunk-
|
|
6
|
-
import '../../chunk-
|
|
1
|
+
export { createEthersClient as createClient, createEthersClient } from '../../chunk-PNTR5FTL.js';
|
|
2
|
+
export { buildDirectRequestStruct, createDepositsResource, createEthersSdk, createFinalizationServices, createInteropFinalizationServices, createInteropResource, createTokensResource, createWithdrawalProtocolService, createWithdrawalsResource, encodeNativeTokenVaultTransferData, encodeSecondBridgeArgs, encodeSecondBridgeDataV1, encodeSecondBridgeErc20Args, encodeSecondBridgeEthArgs, getL2TransactionHashFromLogs } from '../../chunk-B6P24GL5.js';
|
|
3
|
+
export { classifyReadinessFromRevert, createErrorHandlers, decodeRevert, registerErrorAbi, toZKsyncError } from '../../chunk-RZH7HBH3.js';
|
|
4
|
+
import '../../chunk-5S63J6DW.js';
|
|
5
|
+
import '../../chunk-BQ2YCWV2.js';
|
|
6
|
+
import '../../chunk-OEUDZFXH.js';
|
|
7
7
|
import '../../chunk-UMPAKZCQ.js';
|
|
8
8
|
import '../../chunk-BWKWWLY4.js';
|
|
9
|
-
import '../../chunk-
|
|
10
|
-
import '../../chunk-
|
|
11
|
-
import '../../chunk-
|
|
9
|
+
import '../../chunk-4ZANKNIK.js';
|
|
10
|
+
import '../../chunk-JNS4XZE2.js';
|
|
11
|
+
import '../../chunk-3IPSDGHO.js';
|
|
@@ -14,6 +14,7 @@ export interface BuildCtx extends CommonCtx {
|
|
|
14
14
|
baseTokenL1: Address;
|
|
15
15
|
baseIsEth: boolean;
|
|
16
16
|
l1AssetRouter: Address;
|
|
17
|
+
l1NativeTokenVault: Address;
|
|
17
18
|
gasOverrides?: TxGasOverrides;
|
|
18
19
|
l2GasLimit?: bigint;
|
|
19
20
|
gasPerPubdata: bigint;
|
|
@@ -29,6 +30,7 @@ export declare function commonCtx(p: DepositParams, client: EthersClient, tokens
|
|
|
29
30
|
baseTokenL1: `0x${string}`;
|
|
30
31
|
baseIsEth: boolean;
|
|
31
32
|
l1AssetRouter: `0x${string}`;
|
|
33
|
+
l1NativeTokenVault: `0x${string}`;
|
|
32
34
|
route: DepositRoute;
|
|
33
35
|
bridgehub: `0x${string}`;
|
|
34
36
|
chainIdL2: bigint;
|
|
@@ -4,6 +4,7 @@ import type { DepositRoute } from '../../../../../core/types/flows/deposits';
|
|
|
4
4
|
import type { TxGasOverrides } from '../../../../../core/types/fees';
|
|
5
5
|
import type { Address } from '../../../../../core/types/primitives';
|
|
6
6
|
import { type GasQuote } from '../../../../../core/resources/deposits/gas';
|
|
7
|
+
import { type PriorityTxL2Leg } from '../../../../../core/resources/deposits/priority.ts';
|
|
7
8
|
export type { GasQuote };
|
|
8
9
|
export type QuoteL1GasInput = {
|
|
9
10
|
ctx: BuildCtx;
|
|
@@ -35,11 +36,13 @@ export declare function determineErc20L2Gas(input: {
|
|
|
35
36
|
l1Token: Address;
|
|
36
37
|
modelTx?: TransactionRequest;
|
|
37
38
|
priorityFloorGasLimit?: bigint;
|
|
39
|
+
priorityTxL2Leg?: PriorityTxL2Leg;
|
|
38
40
|
undeployedGasLimit?: bigint;
|
|
39
41
|
}): Promise<GasQuote | undefined>;
|
|
40
42
|
export declare function determineEthNonBaseL2Gas(input: {
|
|
41
43
|
ctx: BuildCtx;
|
|
42
44
|
modelTx?: TransactionRequest;
|
|
43
45
|
priorityFloorGasLimit?: bigint;
|
|
46
|
+
priorityTxL2Leg?: PriorityTxL2Leg;
|
|
44
47
|
undeployedGasLimit?: bigint;
|
|
45
48
|
}): Promise<GasQuote | undefined>;
|
|
@@ -47,6 +47,14 @@ var L1_TX_DELTA_FACTORY_DEPS_L2_GAS = 2473n;
|
|
|
47
47
|
var L1_TX_DELTA_FACTORY_DEPS_PUBDATA = 64n;
|
|
48
48
|
var TX_SLOT_OVERHEAD_L2_GAS = 10000n;
|
|
49
49
|
var PRIORITY_TX_MAX_GAS_LIMIT = 72000000n;
|
|
50
|
+
var L1_TX_INTRINSIC_L2_GAS_ZKSYNC_OS = 21000n;
|
|
51
|
+
var L1_TX_CALLDATA_FLOOR_PRICE_L2_GAS_ZKSYNC_OS = 40n;
|
|
52
|
+
var L1_TX_INTRINSIC_PUBDATA_ZKSYNC_OS = 351n;
|
|
53
|
+
var MAX_NATIVE_COMPUTATIONAL_ZKSYNC_OS = 1n << 35n;
|
|
54
|
+
var L1_TX_NATIVE_PER_GAS = 100000000n;
|
|
55
|
+
var ZKSYNC_OS_PRIORITY_TX_TYPE = "0x7f";
|
|
56
|
+
var REGISTERED_TOKEN_BRIDGE_MINT_EXECUTION_GAS = 140000n;
|
|
57
|
+
var REGISTERED_TOKEN_BRIDGE_MINT_PUBDATA_BYTES = 300n;
|
|
50
58
|
|
|
51
59
|
// src/core/utils/number.ts
|
|
52
60
|
var isNumber = (x) => typeof x === "number" && Number.isFinite(x);
|
|
@@ -309,7 +317,7 @@ var OP_DEPOSITS = {
|
|
|
309
317
|
ethNonBase: {
|
|
310
318
|
allowanceBase: "deposits.eth-nonbase:allowanceBaseToken",
|
|
311
319
|
ethBalance: "deposits.eth-nonbase:getEthBalance",
|
|
312
|
-
encodeCalldata: "deposits.eth-nonbase:
|
|
320
|
+
encodeCalldata: "deposits.eth-nonbase:encodeSecondBridgeEthDepositCalldata",
|
|
313
321
|
assertEthAsset: "deposits.eth-nonbase:assertEthAsset",
|
|
314
322
|
assertNonEthBase: "deposits.eth-nonbase:assertNonEthBase",
|
|
315
323
|
assertEthBalance: "deposits.eth-nonbase:assertEthBalance"
|
|
@@ -2700,13 +2708,6 @@ var IL2AssetRouterABI = [
|
|
|
2700
2708
|
outputs: [{ name: "", type: "address", internalType: "address" }],
|
|
2701
2709
|
stateMutability: "view"
|
|
2702
2710
|
},
|
|
2703
|
-
{
|
|
2704
|
-
type: "function",
|
|
2705
|
-
name: "l1TokenAddress",
|
|
2706
|
-
inputs: [{ name: "_l2Token", type: "address", internalType: "address" }],
|
|
2707
|
-
outputs: [{ name: "", type: "address", internalType: "address" }],
|
|
2708
|
-
stateMutability: "view"
|
|
2709
|
-
},
|
|
2710
2711
|
{
|
|
2711
2712
|
type: "function",
|
|
2712
2713
|
name: "l2TokenAddress",
|
|
@@ -6160,7 +6161,7 @@ function toGasOverrides(overrides) {
|
|
|
6160
6161
|
|
|
6161
6162
|
// src/adapters/ethers/resources/deposits/context.ts
|
|
6162
6163
|
async function commonCtx(p, client, tokens, contracts) {
|
|
6163
|
-
const { bridgehub, l1AssetRouter } = await contracts.addresses();
|
|
6164
|
+
const { bridgehub, l1AssetRouter, l1NativeTokenVault } = await contracts.addresses();
|
|
6164
6165
|
const { chainId } = await client.l2.getNetwork();
|
|
6165
6166
|
const sender = await client.signer.getAddress();
|
|
6166
6167
|
const gasPerPubdata = p.gasPerPubdata ?? 800n;
|
|
@@ -6188,6 +6189,7 @@ async function commonCtx(p, client, tokens, contracts) {
|
|
|
6188
6189
|
baseTokenL1,
|
|
6189
6190
|
baseIsEth,
|
|
6190
6191
|
l1AssetRouter,
|
|
6192
|
+
l1NativeTokenVault,
|
|
6191
6193
|
route,
|
|
6192
6194
|
bridgehub,
|
|
6193
6195
|
chainIdL2: BigInt(chainId),
|
|
@@ -6207,18 +6209,6 @@ function encodeSecondBridgeDataV1(assetId, transferData) {
|
|
|
6207
6209
|
const data = abi2.encode(["bytes32", "bytes"], [assetId, transferData]);
|
|
6208
6210
|
return ethers.ethers.concat(["0x01", data]);
|
|
6209
6211
|
}
|
|
6210
|
-
function encodeSecondBridgeArgs(token, amount, l2Receiver) {
|
|
6211
|
-
return ethers.AbiCoder.defaultAbiCoder().encode(
|
|
6212
|
-
["address", "uint256", "address"],
|
|
6213
|
-
[token, amount, l2Receiver]
|
|
6214
|
-
);
|
|
6215
|
-
}
|
|
6216
|
-
function encodeSecondBridgeErc20Args(token, amount, l2Receiver) {
|
|
6217
|
-
return encodeSecondBridgeArgs(token, amount, l2Receiver);
|
|
6218
|
-
}
|
|
6219
|
-
function encodeSecondBridgeEthArgs(amount, l2Receiver, ethToken = ETH_ADDRESS) {
|
|
6220
|
-
return encodeSecondBridgeArgs(ethToken, amount, l2Receiver);
|
|
6221
|
-
}
|
|
6222
6212
|
function buildDirectRequestStruct(args) {
|
|
6223
6213
|
return {
|
|
6224
6214
|
chainId: args.chainId,
|
|
@@ -6425,6 +6415,15 @@ function ethersToGasEstimator(provider) {
|
|
|
6425
6415
|
}
|
|
6426
6416
|
return await provider.estimateGas(ethTx);
|
|
6427
6417
|
},
|
|
6418
|
+
async estimatePriorityTxGas(tx) {
|
|
6419
|
+
if (!("send" in provider)) {
|
|
6420
|
+
throw new Error('Provider does not support "send"; cannot estimate priority tx gas.');
|
|
6421
|
+
}
|
|
6422
|
+
const result = await provider.send("eth_estimateGas", [
|
|
6423
|
+
{ from: tx.from, to: tx.to, data: tx.data, type: ZKSYNC_OS_PRIORITY_TX_TYPE }
|
|
6424
|
+
]);
|
|
6425
|
+
return BigInt(result);
|
|
6426
|
+
},
|
|
6428
6427
|
async estimateFeesPerGas() {
|
|
6429
6428
|
const fd = await provider.getFeeData();
|
|
6430
6429
|
return {
|
|
@@ -6656,9 +6655,79 @@ async function quoteL2BaseCost2(input) {
|
|
|
6656
6655
|
);
|
|
6657
6656
|
}
|
|
6658
6657
|
|
|
6658
|
+
// src/core/resources/deposits/priority.ts
|
|
6659
|
+
var PRIORITY_TX_ENCODING_STEP_BYTES = 544n;
|
|
6660
|
+
var L1_TO_L2_ALIAS_OFFSET = 0x1111000000000000000000000000000000001111n;
|
|
6661
|
+
var DEFAULT_PRIORITY_BODY_GAS_ESTIMATE_MULTIPLIER = 7n;
|
|
6662
|
+
var PRIORITY_L2_GAS_BUFFER = 40n;
|
|
6663
|
+
var maxBigInt2 = (a, b) => a > b ? a : b;
|
|
6664
|
+
var ceilDiv = (a, b) => (a + b - 1n) / b;
|
|
6665
|
+
function applyL1ToL2Alias(address) {
|
|
6666
|
+
return `0x${(BigInt(address) + L1_TO_L2_ALIAS_OFFSET & (1n << 160n) - 1n).toString(16).padStart(40, "0")}`;
|
|
6667
|
+
}
|
|
6668
|
+
function derivePriorityTxGasBreakdown(input) {
|
|
6669
|
+
const factoryDepsCount = input.factoryDepsCount ?? 0n;
|
|
6670
|
+
const minBodyGas = maxBigInt2(
|
|
6671
|
+
L1_TX_INTRINSIC_L2_GAS + ceilDiv(
|
|
6672
|
+
input.encodedLength * L1_TX_DELTA_544_ENCODING_BYTES,
|
|
6673
|
+
PRIORITY_TX_ENCODING_STEP_BYTES
|
|
6674
|
+
) + factoryDepsCount * L1_TX_DELTA_FACTORY_DEPS_L2_GAS,
|
|
6675
|
+
L1_TX_MIN_L2_GAS_BASE
|
|
6676
|
+
) + L1_TX_INTRINSIC_PUBDATA * input.gasPerPubdata + factoryDepsCount * L1_TX_DELTA_FACTORY_DEPS_PUBDATA * input.gasPerPubdata;
|
|
6677
|
+
const overhead = maxBigInt2(TX_SLOT_OVERHEAD_L2_GAS, TX_MEMORY_OVERHEAD_GAS * input.encodedLength);
|
|
6678
|
+
const derivedBodyGas = minBodyGas;
|
|
6679
|
+
return {
|
|
6680
|
+
encodedLength: input.encodedLength,
|
|
6681
|
+
minBodyGas,
|
|
6682
|
+
overhead,
|
|
6683
|
+
derivedBodyGas,
|
|
6684
|
+
derivedL2GasLimit: derivedBodyGas + overhead,
|
|
6685
|
+
priorityTxMaxGasLimit: PRIORITY_TX_MAX_GAS_LIMIT,
|
|
6686
|
+
priorityTxMaxGasLimitExceeded: derivedBodyGas > PRIORITY_TX_MAX_GAS_LIMIT
|
|
6687
|
+
};
|
|
6688
|
+
}
|
|
6689
|
+
function derivePriorityBodyGasEstimateCap(input) {
|
|
6690
|
+
return input.minBodyGas * (input.multiplier ?? DEFAULT_PRIORITY_BODY_GAS_ESTIMATE_MULTIPLIER);
|
|
6691
|
+
}
|
|
6692
|
+
function applyPriorityL2GasLimitBuffer(input) {
|
|
6693
|
+
return input.gasLimit * (100n + PRIORITY_L2_GAS_BUFFER) / 100n;
|
|
6694
|
+
}
|
|
6695
|
+
function minimalPriorityTxL2Gas(input) {
|
|
6696
|
+
const intrinsic = L1_TX_INTRINSIC_L2_GAS_ZKSYNC_OS + L1_TX_CALLDATA_FLOOR_PRICE_L2_GAS_ZKSYNC_OS * input.calldataLength;
|
|
6697
|
+
const pubdata = L1_TX_INTRINSIC_PUBDATA_ZKSYNC_OS * input.gasPerPubdata + ceilDiv(MAX_NATIVE_COMPUTATIONAL_ZKSYNC_OS, L1_TX_NATIVE_PER_GAS);
|
|
6698
|
+
return maxBigInt2(intrinsic, pubdata);
|
|
6699
|
+
}
|
|
6700
|
+
function clampPriorityL2GasLimit(input) {
|
|
6701
|
+
return maxBigInt2(
|
|
6702
|
+
input.gasLimit,
|
|
6703
|
+
minimalPriorityTxL2Gas({
|
|
6704
|
+
calldataLength: BigInt(Math.max(input.l2Calldata.length - 2, 0) / 2),
|
|
6705
|
+
gasPerPubdata: input.gasPerPubdata
|
|
6706
|
+
})
|
|
6707
|
+
);
|
|
6708
|
+
}
|
|
6709
|
+
function resolveRegisteredTokenPriorityL2GasLimit(input) {
|
|
6710
|
+
if (input.nodeEstimate != null && input.nodeEstimate > 0n) {
|
|
6711
|
+
return maxBigInt2(input.priorityFloorGasLimit, applyGasBuffer(input.nodeEstimate));
|
|
6712
|
+
}
|
|
6713
|
+
const modeledGas = REGISTERED_TOKEN_BRIDGE_MINT_EXECUTION_GAS + REGISTERED_TOKEN_BRIDGE_MINT_PUBDATA_BYTES * input.gasPerPubdata;
|
|
6714
|
+
return maxBigInt2(
|
|
6715
|
+
input.priorityFloorGasLimit,
|
|
6716
|
+
applyPriorityL2GasLimitBuffer({ gasLimit: modeledGas })
|
|
6717
|
+
);
|
|
6718
|
+
}
|
|
6719
|
+
|
|
6659
6720
|
// src/adapters/ethers/resources/deposits/services/gas.ts
|
|
6660
6721
|
var DEFAULT_SAFE_NONBASE_L2_GAS_LIMIT = 3000000n;
|
|
6661
6722
|
var ZERO_L2_TOKEN_ADDRESS = "0x0000000000000000000000000000000000000000";
|
|
6723
|
+
async function estimatePriorityTxL2Gas(ctx, leg) {
|
|
6724
|
+
if (!leg) return void 0;
|
|
6725
|
+
try {
|
|
6726
|
+
return await ethersToGasEstimator(ctx.client.l2).estimatePriorityTxGas?.(leg);
|
|
6727
|
+
} catch {
|
|
6728
|
+
return void 0;
|
|
6729
|
+
}
|
|
6730
|
+
}
|
|
6662
6731
|
async function quoteL1Gas2(input) {
|
|
6663
6732
|
const { ctx, tx, overrides, fallbackGasLimit } = input;
|
|
6664
6733
|
const estimator = ethersToGasEstimator(ctx.client.l1);
|
|
@@ -6712,7 +6781,12 @@ async function determineNonBaseL2Gas(input) {
|
|
|
6712
6781
|
return quoteL2Gas2({
|
|
6713
6782
|
ctx,
|
|
6714
6783
|
route,
|
|
6715
|
-
overrideGasLimit:
|
|
6784
|
+
overrideGasLimit: resolveRegisteredTokenPriorityL2GasLimit({
|
|
6785
|
+
chainIdL2: ctx.chainIdL2,
|
|
6786
|
+
priorityFloorGasLimit: input.priorityFloorGasLimit,
|
|
6787
|
+
gasPerPubdata: ctx.gasPerPubdata,
|
|
6788
|
+
nodeEstimate: await estimatePriorityTxL2Gas(ctx, input.priorityTxL2Leg)
|
|
6789
|
+
})
|
|
6716
6790
|
});
|
|
6717
6791
|
}
|
|
6718
6792
|
const modelTx = {
|
|
@@ -6749,6 +6823,7 @@ async function determineEthNonBaseL2Gas(input) {
|
|
|
6749
6823
|
knownL2Token: input.ctx.resolvedToken?.l2,
|
|
6750
6824
|
modelTx: input.modelTx,
|
|
6751
6825
|
priorityFloorGasLimit: input.priorityFloorGasLimit,
|
|
6826
|
+
priorityTxL2Leg: input.priorityTxL2Leg,
|
|
6752
6827
|
undeployedGasLimit: input.undeployedGasLimit
|
|
6753
6828
|
});
|
|
6754
6829
|
}
|
|
@@ -6780,40 +6855,6 @@ function buildFeeBreakdown(p) {
|
|
|
6780
6855
|
l2
|
|
6781
6856
|
};
|
|
6782
6857
|
}
|
|
6783
|
-
|
|
6784
|
-
// src/core/resources/deposits/priority.ts
|
|
6785
|
-
var PRIORITY_TX_ENCODING_STEP_BYTES = 544n;
|
|
6786
|
-
var DEFAULT_PRIORITY_BODY_GAS_ESTIMATE_MULTIPLIER = 7n;
|
|
6787
|
-
var PRIORITY_L2_GAS_BUFFER = 40n;
|
|
6788
|
-
var maxBigInt2 = (a, b) => a > b ? a : b;
|
|
6789
|
-
var ceilDiv = (a, b) => (a + b - 1n) / b;
|
|
6790
|
-
function derivePriorityTxGasBreakdown(input) {
|
|
6791
|
-
const factoryDepsCount = input.factoryDepsCount ?? 0n;
|
|
6792
|
-
const minBodyGas = maxBigInt2(
|
|
6793
|
-
L1_TX_INTRINSIC_L2_GAS + ceilDiv(
|
|
6794
|
-
input.encodedLength * L1_TX_DELTA_544_ENCODING_BYTES,
|
|
6795
|
-
PRIORITY_TX_ENCODING_STEP_BYTES
|
|
6796
|
-
) + factoryDepsCount * L1_TX_DELTA_FACTORY_DEPS_L2_GAS,
|
|
6797
|
-
L1_TX_MIN_L2_GAS_BASE
|
|
6798
|
-
) + L1_TX_INTRINSIC_PUBDATA * input.gasPerPubdata + factoryDepsCount * L1_TX_DELTA_FACTORY_DEPS_PUBDATA * input.gasPerPubdata;
|
|
6799
|
-
const overhead = maxBigInt2(TX_SLOT_OVERHEAD_L2_GAS, TX_MEMORY_OVERHEAD_GAS * input.encodedLength);
|
|
6800
|
-
const derivedBodyGas = minBodyGas;
|
|
6801
|
-
return {
|
|
6802
|
-
encodedLength: input.encodedLength,
|
|
6803
|
-
minBodyGas,
|
|
6804
|
-
overhead,
|
|
6805
|
-
derivedBodyGas,
|
|
6806
|
-
derivedL2GasLimit: derivedBodyGas + overhead,
|
|
6807
|
-
priorityTxMaxGasLimit: PRIORITY_TX_MAX_GAS_LIMIT,
|
|
6808
|
-
priorityTxMaxGasLimitExceeded: derivedBodyGas > PRIORITY_TX_MAX_GAS_LIMIT
|
|
6809
|
-
};
|
|
6810
|
-
}
|
|
6811
|
-
function derivePriorityBodyGasEstimateCap(input) {
|
|
6812
|
-
return input.minBodyGas * (input.multiplier ?? DEFAULT_PRIORITY_BODY_GAS_ESTIMATE_MULTIPLIER);
|
|
6813
|
-
}
|
|
6814
|
-
function applyPriorityL2GasLimitBuffer(input) {
|
|
6815
|
-
return input.gasLimit * (100n + PRIORITY_L2_GAS_BUFFER) / 100n;
|
|
6816
|
-
}
|
|
6817
6858
|
var EMPTY_BYTES = "0x";
|
|
6818
6859
|
var ZERO_RESERVED_WORDS = [0n, 0n, 0n, 0n];
|
|
6819
6860
|
var L2_CANONICAL_TRANSACTION_TUPLE = "tuple(uint256 txType,uint256 from,uint256 to,uint256 gasLimit,uint256 gasPerPubdataByteLimit,uint256 maxFeePerGas,uint256 maxPriorityFeePerGas,uint256 paymaster,uint256 nonce,uint256 value,uint256[4] reserved,bytes data,bytes signature,uint256[] factoryDeps,bytes paymasterInput,bytes reservedDynamic)";
|
|
@@ -6870,9 +6911,13 @@ function routeEthDirect() {
|
|
|
6870
6911
|
l2Calldata,
|
|
6871
6912
|
gasPerPubdata: ctx.gasPerPubdata
|
|
6872
6913
|
});
|
|
6873
|
-
const quotedL2GasLimit = ctx.l2GasLimit ??
|
|
6874
|
-
|
|
6875
|
-
|
|
6914
|
+
const quotedL2GasLimit = ctx.l2GasLimit ?? clampPriorityL2GasLimit({
|
|
6915
|
+
gasLimit: applyPriorityL2GasLimitBuffer({
|
|
6916
|
+
chainIdL2: ctx.chainIdL2,
|
|
6917
|
+
gasLimit: priorityFloorBreakdown.derivedL2GasLimit
|
|
6918
|
+
}),
|
|
6919
|
+
l2Calldata,
|
|
6920
|
+
gasPerPubdata: ctx.gasPerPubdata
|
|
6876
6921
|
});
|
|
6877
6922
|
const l2GasParams = await quoteL2Gas2({
|
|
6878
6923
|
ctx,
|
|
@@ -6962,26 +7007,18 @@ var ntvCodec = createNTVCodec({
|
|
|
6962
7007
|
keccak256: (data) => ethers.keccak256(data)
|
|
6963
7008
|
});
|
|
6964
7009
|
async function encodeSecondBridgeErc20DepositCalldata(input) {
|
|
6965
|
-
|
|
6966
|
-
|
|
6967
|
-
|
|
6968
|
-
const { chainId } = await input.ctx.client.l1.getNetwork();
|
|
6969
|
-
const expectedL1AssetId = ntvCodec.encodeAssetId(
|
|
6970
|
-
BigInt(chainId),
|
|
7010
|
+
const registeredAssetId = input.ctx.resolvedToken?.assetId;
|
|
7011
|
+
const assetId = registeredAssetId && registeredAssetId.toLowerCase() !== ZERO_ASSET_ID ? registeredAssetId : ntvCodec.encodeAssetId(
|
|
7012
|
+
BigInt((await input.ctx.client.l1.getNetwork()).chainId),
|
|
6971
7013
|
L2_NATIVE_TOKEN_VAULT_ADDRESS,
|
|
6972
7014
|
input.token
|
|
6973
7015
|
);
|
|
6974
|
-
const assetId = input.ctx.resolvedToken.assetId.toLowerCase();
|
|
6975
|
-
const isL1Origin = assetId === ZERO_ASSET_ID || assetId === expectedL1AssetId.toLowerCase();
|
|
6976
|
-
if (isL1Origin) {
|
|
6977
|
-
return encodeSecondBridgeErc20Args(input.token, input.amount, input.receiver);
|
|
6978
|
-
}
|
|
6979
7016
|
const transferData = encodeNativeTokenVaultTransferData(
|
|
6980
7017
|
input.amount,
|
|
6981
7018
|
input.receiver,
|
|
6982
7019
|
input.token
|
|
6983
7020
|
);
|
|
6984
|
-
return encodeSecondBridgeDataV1(
|
|
7021
|
+
return encodeSecondBridgeDataV1(assetId, transferData);
|
|
6985
7022
|
}
|
|
6986
7023
|
async function getPriorityGasModel(input) {
|
|
6987
7024
|
try {
|
|
@@ -7016,9 +7053,18 @@ async function getPriorityGasModel(input) {
|
|
|
7016
7053
|
gasPerPubdata: input.ctx.gasPerPubdata
|
|
7017
7054
|
});
|
|
7018
7055
|
const model = {
|
|
7019
|
-
|
|
7020
|
-
|
|
7021
|
-
|
|
7056
|
+
priorityTxL2Leg: {
|
|
7057
|
+
from: applyL1ToL2Alias(input.ctx.l1AssetRouter),
|
|
7058
|
+
to: L2_ASSET_ROUTER_ADDRESS,
|
|
7059
|
+
data: l2Calldata
|
|
7060
|
+
},
|
|
7061
|
+
priorityFloorGasLimit: clampPriorityL2GasLimit({
|
|
7062
|
+
gasLimit: applyPriorityL2GasLimitBuffer({
|
|
7063
|
+
chainIdL2: input.ctx.chainIdL2,
|
|
7064
|
+
gasLimit: priorityFloorBreakdown.derivedL2GasLimit
|
|
7065
|
+
}),
|
|
7066
|
+
l2Calldata,
|
|
7067
|
+
gasPerPubdata: input.ctx.gasPerPubdata
|
|
7022
7068
|
})
|
|
7023
7069
|
};
|
|
7024
7070
|
if (isFirstBridge || input.ctx.resolvedToken.l2.toLowerCase() === ZERO_L2_TOKEN_ADDRESS2) {
|
|
@@ -7076,6 +7122,7 @@ function routeErc20NonBase() {
|
|
|
7076
7122
|
ctx,
|
|
7077
7123
|
l1Token: p.token,
|
|
7078
7124
|
priorityFloorGasLimit: priorityGasModel.priorityFloorGasLimit,
|
|
7125
|
+
priorityTxL2Leg: priorityGasModel.priorityTxL2Leg,
|
|
7079
7126
|
undeployedGasLimit: priorityGasModel.undeployedGasLimit,
|
|
7080
7127
|
modelTx: {
|
|
7081
7128
|
to: receiver,
|
|
@@ -7090,25 +7137,29 @@ function routeErc20NonBase() {
|
|
|
7090
7137
|
const approvals = [];
|
|
7091
7138
|
const steps = [];
|
|
7092
7139
|
const assetRouter = ctx.l1AssetRouter;
|
|
7140
|
+
const nativeTokenVault = ctx.l1NativeTokenVault;
|
|
7093
7141
|
const erc20Deposit = new ethers.Contract(p.token, IERC20_default, l1Signer);
|
|
7094
7142
|
const allowanceToken = await wrapAs2(
|
|
7095
7143
|
"RPC",
|
|
7096
7144
|
OP_DEPOSITS.nonbase.allowanceToken,
|
|
7097
|
-
() => erc20Deposit.allowance(ctx.sender,
|
|
7145
|
+
() => erc20Deposit.allowance(ctx.sender, nativeTokenVault),
|
|
7098
7146
|
{
|
|
7099
|
-
ctx: { where: "erc20.allowance", token: p.token, spender:
|
|
7147
|
+
ctx: { where: "erc20.allowance", token: p.token, spender: nativeTokenVault },
|
|
7100
7148
|
message: "Failed to read deposit-token allowance."
|
|
7101
7149
|
}
|
|
7102
7150
|
);
|
|
7103
7151
|
if (allowanceToken < p.amount) {
|
|
7104
|
-
approvals.push({ token: p.token, spender:
|
|
7152
|
+
approvals.push({ token: p.token, spender: nativeTokenVault, amount: p.amount });
|
|
7105
7153
|
steps.push({
|
|
7106
|
-
key: `approve:${p.token}:${
|
|
7154
|
+
key: `approve:${p.token}:${nativeTokenVault}`,
|
|
7107
7155
|
kind: "approve",
|
|
7108
|
-
description: `Approve ${p.amount} for
|
|
7156
|
+
description: `Approve ${p.amount} for the native token vault (deposit token)`,
|
|
7109
7157
|
tx: {
|
|
7110
7158
|
to: p.token,
|
|
7111
|
-
data: erc20Deposit.interface.encodeFunctionData("approve", [
|
|
7159
|
+
data: erc20Deposit.interface.encodeFunctionData("approve", [
|
|
7160
|
+
nativeTokenVault,
|
|
7161
|
+
p.amount
|
|
7162
|
+
]),
|
|
7112
7163
|
from: ctx.sender,
|
|
7113
7164
|
...ctx.gasOverrides
|
|
7114
7165
|
}
|
|
@@ -7119,21 +7170,24 @@ function routeErc20NonBase() {
|
|
|
7119
7170
|
const allowanceBase = await wrapAs2(
|
|
7120
7171
|
"RPC",
|
|
7121
7172
|
OP_DEPOSITS.nonbase.allowanceBase,
|
|
7122
|
-
() => erc20Base.allowance(ctx.sender,
|
|
7173
|
+
() => erc20Base.allowance(ctx.sender, nativeTokenVault),
|
|
7123
7174
|
{
|
|
7124
|
-
ctx: { where: "erc20.allowance", token: baseToken, spender:
|
|
7175
|
+
ctx: { where: "erc20.allowance", token: baseToken, spender: nativeTokenVault },
|
|
7125
7176
|
message: "Failed to read base-token allowance."
|
|
7126
7177
|
}
|
|
7127
7178
|
);
|
|
7128
7179
|
if (allowanceBase < mintValue) {
|
|
7129
|
-
approvals.push({ token: baseToken, spender:
|
|
7180
|
+
approvals.push({ token: baseToken, spender: nativeTokenVault, amount: mintValue });
|
|
7130
7181
|
steps.push({
|
|
7131
|
-
key: `approve:${baseToken}:${
|
|
7182
|
+
key: `approve:${baseToken}:${nativeTokenVault}`,
|
|
7132
7183
|
kind: "approve",
|
|
7133
7184
|
description: `Approve base token for mintValue`,
|
|
7134
7185
|
tx: {
|
|
7135
7186
|
to: baseToken,
|
|
7136
|
-
data: erc20Base.interface.encodeFunctionData("approve", [
|
|
7187
|
+
data: erc20Base.interface.encodeFunctionData("approve", [
|
|
7188
|
+
nativeTokenVault,
|
|
7189
|
+
mintValue
|
|
7190
|
+
]),
|
|
7137
7191
|
from: ctx.sender,
|
|
7138
7192
|
...ctx.gasOverrides
|
|
7139
7193
|
}
|
|
@@ -7203,6 +7257,20 @@ var ntvCodec2 = createNTVCodec({
|
|
|
7203
7257
|
encode: (types, values) => ethers.AbiCoder.defaultAbiCoder().encode(types, values),
|
|
7204
7258
|
keccak256: (data) => ethers.keccak256(data)
|
|
7205
7259
|
});
|
|
7260
|
+
async function encodeSecondBridgeEthDepositCalldata(input) {
|
|
7261
|
+
const registeredAssetId = input.ctx.resolvedToken?.assetId;
|
|
7262
|
+
const assetId = registeredAssetId && registeredAssetId.toLowerCase() !== ZERO_ASSET_ID2 ? registeredAssetId : ntvCodec2.encodeAssetId(
|
|
7263
|
+
BigInt((await input.ctx.client.l1.getNetwork()).chainId),
|
|
7264
|
+
L2_NATIVE_TOKEN_VAULT_ADDRESS,
|
|
7265
|
+
ETH_ADDRESS
|
|
7266
|
+
);
|
|
7267
|
+
const transferData = encodeNativeTokenVaultTransferData(
|
|
7268
|
+
input.amount,
|
|
7269
|
+
input.receiver,
|
|
7270
|
+
ETH_ADDRESS
|
|
7271
|
+
);
|
|
7272
|
+
return encodeSecondBridgeDataV1(assetId, transferData);
|
|
7273
|
+
}
|
|
7206
7274
|
async function getPriorityGasModel2(input) {
|
|
7207
7275
|
try {
|
|
7208
7276
|
const l1AssetRouter = await input.ctx.contracts.l1AssetRouter();
|
|
@@ -7230,9 +7298,18 @@ async function getPriorityGasModel2(input) {
|
|
|
7230
7298
|
gasPerPubdata: input.ctx.gasPerPubdata
|
|
7231
7299
|
});
|
|
7232
7300
|
const model = {
|
|
7233
|
-
|
|
7234
|
-
|
|
7235
|
-
|
|
7301
|
+
priorityTxL2Leg: {
|
|
7302
|
+
from: applyL1ToL2Alias(input.ctx.l1AssetRouter),
|
|
7303
|
+
to: L2_ASSET_ROUTER_ADDRESS,
|
|
7304
|
+
data: l2Calldata
|
|
7305
|
+
},
|
|
7306
|
+
priorityFloorGasLimit: clampPriorityL2GasLimit({
|
|
7307
|
+
gasLimit: applyPriorityL2GasLimitBuffer({
|
|
7308
|
+
chainIdL2: input.ctx.chainIdL2,
|
|
7309
|
+
gasLimit: priorityFloorBreakdown.derivedL2GasLimit
|
|
7310
|
+
}),
|
|
7311
|
+
l2Calldata,
|
|
7312
|
+
gasPerPubdata: input.ctx.gasPerPubdata
|
|
7236
7313
|
})
|
|
7237
7314
|
};
|
|
7238
7315
|
if (input.ctx.resolvedToken.l2.toLowerCase() === ZERO_L2_TOKEN_ADDRESS3) {
|
|
@@ -7309,6 +7386,7 @@ function routeEthNonBase() {
|
|
|
7309
7386
|
ctx,
|
|
7310
7387
|
modelTx: l2TxModel,
|
|
7311
7388
|
priorityFloorGasLimit: priorityGasModel.priorityFloorGasLimit,
|
|
7389
|
+
priorityTxL2Leg: priorityGasModel.priorityTxL2Leg,
|
|
7312
7390
|
undeployedGasLimit: priorityGasModel.undeployedGasLimit
|
|
7313
7391
|
});
|
|
7314
7392
|
if (!l2GasParams) throw new Error("Failed to estimate L2 gas parameters.");
|
|
@@ -7320,21 +7398,24 @@ function routeEthNonBase() {
|
|
|
7320
7398
|
const allowance = await wrapAs3(
|
|
7321
7399
|
"RPC",
|
|
7322
7400
|
OP_DEPOSITS.ethNonBase.allowanceBase,
|
|
7323
|
-
() => erc20Base.allowance(ctx.sender, ctx.
|
|
7401
|
+
() => erc20Base.allowance(ctx.sender, ctx.l1NativeTokenVault),
|
|
7324
7402
|
{
|
|
7325
|
-
ctx: { where: "erc20.allowance", token: baseToken, spender: ctx.
|
|
7403
|
+
ctx: { where: "erc20.allowance", token: baseToken, spender: ctx.l1NativeTokenVault },
|
|
7326
7404
|
message: "Failed to read base-token allowance."
|
|
7327
7405
|
}
|
|
7328
7406
|
);
|
|
7329
7407
|
if (allowance < mintValue) {
|
|
7330
|
-
approvals.push({ token: baseToken, spender: ctx.
|
|
7408
|
+
approvals.push({ token: baseToken, spender: ctx.l1NativeTokenVault, amount: mintValue });
|
|
7331
7409
|
steps.push({
|
|
7332
|
-
key: `approve:${baseToken}:${ctx.
|
|
7410
|
+
key: `approve:${baseToken}:${ctx.l1NativeTokenVault}`,
|
|
7333
7411
|
kind: "approve",
|
|
7334
7412
|
description: `Approve base token for fees (mintValue)`,
|
|
7335
7413
|
tx: {
|
|
7336
7414
|
to: baseToken,
|
|
7337
|
-
data: erc20Base.interface.encodeFunctionData("approve", [
|
|
7415
|
+
data: erc20Base.interface.encodeFunctionData("approve", [
|
|
7416
|
+
ctx.l1NativeTokenVault,
|
|
7417
|
+
mintValue
|
|
7418
|
+
]),
|
|
7338
7419
|
from: ctx.sender,
|
|
7339
7420
|
...ctx.gasOverrides
|
|
7340
7421
|
}
|
|
@@ -7343,10 +7424,10 @@ function routeEthNonBase() {
|
|
|
7343
7424
|
const secondBridgeCalldata = await wrapAs3(
|
|
7344
7425
|
"INTERNAL",
|
|
7345
7426
|
OP_DEPOSITS.ethNonBase.encodeCalldata,
|
|
7346
|
-
() =>
|
|
7427
|
+
() => encodeSecondBridgeEthDepositCalldata({ ctx, amount: p.amount, receiver }),
|
|
7347
7428
|
{
|
|
7348
7429
|
ctx: {
|
|
7349
|
-
where: "
|
|
7430
|
+
where: "encodeSecondBridgeEthDepositCalldata",
|
|
7350
7431
|
amount: p.amount.toString(),
|
|
7351
7432
|
to: receiver
|
|
7352
7433
|
}
|
|
@@ -7450,9 +7531,13 @@ function routeErc20Base() {
|
|
|
7450
7531
|
l2Calldata,
|
|
7451
7532
|
gasPerPubdata: ctx.gasPerPubdata
|
|
7452
7533
|
});
|
|
7453
|
-
const quotedL2GasLimit = ctx.l2GasLimit ??
|
|
7454
|
-
|
|
7455
|
-
|
|
7534
|
+
const quotedL2GasLimit = ctx.l2GasLimit ?? clampPriorityL2GasLimit({
|
|
7535
|
+
gasLimit: applyPriorityL2GasLimitBuffer({
|
|
7536
|
+
chainIdL2: ctx.chainIdL2,
|
|
7537
|
+
gasLimit: priorityFloorBreakdown.derivedL2GasLimit
|
|
7538
|
+
}),
|
|
7539
|
+
l2Calldata,
|
|
7540
|
+
gasPerPubdata: ctx.gasPerPubdata
|
|
7456
7541
|
});
|
|
7457
7542
|
const l2GasParams = await quoteL2Gas2({
|
|
7458
7543
|
ctx,
|
|
@@ -7469,21 +7554,24 @@ function routeErc20Base() {
|
|
|
7469
7554
|
const allowance = await wrapAs4(
|
|
7470
7555
|
"RPC",
|
|
7471
7556
|
OP_DEPOSITS.base.allowance,
|
|
7472
|
-
() => erc20.allowance(ctx.sender, ctx.
|
|
7557
|
+
() => erc20.allowance(ctx.sender, ctx.l1NativeTokenVault),
|
|
7473
7558
|
{
|
|
7474
|
-
ctx: { where: "erc20.allowance", token: baseToken, spender: ctx.
|
|
7559
|
+
ctx: { where: "erc20.allowance", token: baseToken, spender: ctx.l1NativeTokenVault },
|
|
7475
7560
|
message: "Failed to read base-token allowance."
|
|
7476
7561
|
}
|
|
7477
7562
|
);
|
|
7478
7563
|
if (allowance < mintValue) {
|
|
7479
|
-
approvals.push({ token: baseToken, spender: ctx.
|
|
7564
|
+
approvals.push({ token: baseToken, spender: ctx.l1NativeTokenVault, amount: mintValue });
|
|
7480
7565
|
steps.push({
|
|
7481
|
-
key: `approve:${baseToken}:${ctx.
|
|
7566
|
+
key: `approve:${baseToken}:${ctx.l1NativeTokenVault}`,
|
|
7482
7567
|
kind: "approve",
|
|
7483
7568
|
description: "Approve base token for mintValue",
|
|
7484
7569
|
tx: {
|
|
7485
7570
|
to: baseToken,
|
|
7486
|
-
data: erc20.interface.encodeFunctionData("approve", [
|
|
7571
|
+
data: erc20.interface.encodeFunctionData("approve", [
|
|
7572
|
+
ctx.l1NativeTokenVault,
|
|
7573
|
+
mintValue
|
|
7574
|
+
]),
|
|
7487
7575
|
from: ctx.sender,
|
|
7488
7576
|
...ctx.gasOverrides
|
|
7489
7577
|
}
|
|
@@ -7617,8 +7705,17 @@ function createTokensResource(client) {
|
|
|
7617
7705
|
const { chainId } = await client.l2.getNetwork();
|
|
7618
7706
|
return await client.baseToken(BigInt(chainId));
|
|
7619
7707
|
}
|
|
7620
|
-
const {
|
|
7621
|
-
const
|
|
7708
|
+
const { l2NativeTokenVault, l1NativeTokenVault } = await client.contracts();
|
|
7709
|
+
const assetId = await l2NativeTokenVault.assetId(l2Token);
|
|
7710
|
+
if (BigInt(assetId) === 0n) {
|
|
7711
|
+
throw new Error(`Token ${l2Token} is not registered in the L2 NativeTokenVault.`);
|
|
7712
|
+
}
|
|
7713
|
+
const l1Token = await l1NativeTokenVault.tokenAddress(assetId);
|
|
7714
|
+
if (BigInt(l1Token) === 0n) {
|
|
7715
|
+
throw new Error(
|
|
7716
|
+
`Token ${l2Token} has no L1 counterpart registered in the L1 NativeTokenVault.`
|
|
7717
|
+
);
|
|
7718
|
+
}
|
|
7622
7719
|
return l1Token;
|
|
7623
7720
|
});
|
|
7624
7721
|
}
|