@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,14 +1,14 @@
|
|
|
1
|
-
import { createNTVCodec, createAttributesResource, resolveCreateDepositL1GasLimit, isInteropFinalizationInfo, DEFAULT_POLL_MS, DEFAULT_TIMEOUT_MS, resolveIdsFromWaitable, parseBundleReceiptInfo, buildFinalizationInfo, parseBundleSentFromReceipt, pickInteropRoute, ZERO_HASH, toGasOverrides, applyPriorityL2GasLimitBuffer, buildFeeBreakdown, buildIndirectBundle, preflightIndirect, buildDirectBundle, preflightDirect, derivePriorityTxGasBreakdown, quoteL2Gas, quoteL1Gas, derivePriorityBodyGasEstimateCap, assertProtocolVersion, quoteL2Gas2 } from './chunk-
|
|
2
|
-
import { detectWithdrawalProtocol, buildWithdrawalFinalization, parseBundleHashFromLogs, classifyWithdrawalOutcome, phaseFromReadiness, buildWithdrawalBundle } from './chunk-
|
|
3
|
-
import { findL1MessageSentLog, messengerLogIndex, l1MessageSentSender, pickWithdrawRoute } from './chunk-
|
|
4
|
-
import { createErrorHandlers, toZKsyncError, classifyReadinessFromRevert } from './chunk-
|
|
5
|
-
import { IERC7786Attributes_default, isHash66, IL1Nullifier_default, IInteropHandler_default, OP_WITHDRAWALS, createError, normalizeL1Token, isAddressEq, hexEq, OP_DEPOSITS, IERC20_default, isZKsyncError, isReceiptNotFound, IL1NullifierV32_default, OP_INTEROP, IInteropRootStorage_default, IInteropCenter_default, sleep, IBridgehub_default, isETH, normalizeAddrEq, IL2AssetRouter_default, L2NativeTokenVault_default, IBaseToken_default, assertNever } from './chunk-
|
|
6
|
-
import { ETH_ADDRESS, TOPIC_CANONICAL_ASSIGNED, TOPIC_CANONICAL_SUCCESS, L2_BASE_TOKEN_ADDRESS, L2_NATIVE_TOKEN_VAULT_ADDRESS, L1_MESSENGER_ADDRESS, L2_INTEROP_ROOT_STORAGE_ADDRESS, BUFFER, SAFE_L1_BRIDGE_GAS, L2_ASSET_ROUTER_ADDRESS, FORMAL_ETH_ADDRESS } from './chunk-
|
|
1
|
+
import { createNTVCodec, createAttributesResource, resolveCreateDepositL1GasLimit, isInteropFinalizationInfo, DEFAULT_POLL_MS, DEFAULT_TIMEOUT_MS, resolveIdsFromWaitable, parseBundleReceiptInfo, buildFinalizationInfo, parseBundleSentFromReceipt, pickInteropRoute, ZERO_HASH, toGasOverrides, clampPriorityL2GasLimit, applyPriorityL2GasLimitBuffer, buildFeeBreakdown, buildIndirectBundle, preflightIndirect, buildDirectBundle, preflightDirect, derivePriorityTxGasBreakdown, quoteL2Gas, quoteL1Gas, applyL1ToL2Alias, derivePriorityBodyGasEstimateCap, assertProtocolVersion, resolveRegisteredTokenPriorityL2GasLimit, quoteL2Gas2 } from './chunk-5S63J6DW.js';
|
|
2
|
+
import { detectWithdrawalProtocol, buildWithdrawalFinalization, parseBundleHashFromLogs, classifyWithdrawalOutcome, phaseFromReadiness, buildWithdrawalBundle } from './chunk-BQ2YCWV2.js';
|
|
3
|
+
import { findL1MessageSentLog, messengerLogIndex, l1MessageSentSender, pickWithdrawRoute } from './chunk-OEUDZFXH.js';
|
|
4
|
+
import { createErrorHandlers, toZKsyncError, classifyReadinessFromRevert } from './chunk-H5A6GU3D.js';
|
|
5
|
+
import { IERC7786Attributes_default, isHash66, IL1Nullifier_default, IInteropHandler_default, OP_WITHDRAWALS, createError, normalizeL1Token, isAddressEq, hexEq, OP_DEPOSITS, IERC20_default, isZKsyncError, isReceiptNotFound, IL1NullifierV32_default, OP_INTEROP, IInteropRootStorage_default, IInteropCenter_default, sleep, IBridgehub_default, isETH, normalizeAddrEq, IL2AssetRouter_default, L2NativeTokenVault_default, IBaseToken_default, assertNever } from './chunk-JNS4XZE2.js';
|
|
6
|
+
import { ETH_ADDRESS, TOPIC_CANONICAL_ASSIGNED, TOPIC_CANONICAL_SUCCESS, L2_BASE_TOKEN_ADDRESS, L2_NATIVE_TOKEN_VAULT_ADDRESS, L1_MESSENGER_ADDRESS, L2_INTEROP_ROOT_STORAGE_ADDRESS, BUFFER, SAFE_L1_BRIDGE_GAS, L2_ASSET_ROUTER_ADDRESS, FORMAL_ETH_ADDRESS, ZKSYNC_OS_PRIORITY_TX_TYPE } from './chunk-3IPSDGHO.js';
|
|
7
7
|
import { keccak256, encodeAbiParameters, toBytes, encodeFunctionData, concat, decodeEventLog, createWalletClient, custom, decodeAbiParameters, createPublicClient, http, encodeEventTopics, numberToHex, zeroAddress, getAddress, toHex } from 'viem';
|
|
8
8
|
|
|
9
9
|
// src/adapters/viem/resources/deposits/context.ts
|
|
10
10
|
async function commonCtx(p, client, tokens, contracts) {
|
|
11
|
-
const { bridgehub, l1AssetRouter } = await contracts.addresses();
|
|
11
|
+
const { bridgehub, l1AssetRouter, l1NativeTokenVault } = await contracts.addresses();
|
|
12
12
|
const chainId = await client.l2.getChainId();
|
|
13
13
|
const sender = client.account.address;
|
|
14
14
|
const gasPerPubdata = p.gasPerPubdata ?? 800n;
|
|
@@ -36,6 +36,7 @@ async function commonCtx(p, client, tokens, contracts) {
|
|
|
36
36
|
baseTokenL1,
|
|
37
37
|
baseIsEth,
|
|
38
38
|
l1AssetRouter,
|
|
39
|
+
l1NativeTokenVault,
|
|
39
40
|
route,
|
|
40
41
|
bridgehub,
|
|
41
42
|
chainIdL2: BigInt(chainId),
|
|
@@ -148,6 +149,20 @@ function viemToGasEstimator(client) {
|
|
|
148
149
|
maxPriorityFeePerGas: tx.maxPriorityFeePerGas
|
|
149
150
|
});
|
|
150
151
|
},
|
|
152
|
+
async estimatePriorityTxGas(tx) {
|
|
153
|
+
const result = await client.request({
|
|
154
|
+
method: "eth_estimateGas",
|
|
155
|
+
params: [
|
|
156
|
+
{
|
|
157
|
+
from: tx.from,
|
|
158
|
+
to: tx.to,
|
|
159
|
+
data: tx.data,
|
|
160
|
+
type: ZKSYNC_OS_PRIORITY_TX_TYPE
|
|
161
|
+
}
|
|
162
|
+
]
|
|
163
|
+
});
|
|
164
|
+
return BigInt(result);
|
|
165
|
+
},
|
|
151
166
|
async estimateFeesPerGas() {
|
|
152
167
|
try {
|
|
153
168
|
const fees = await client.estimateFeesPerGas();
|
|
@@ -181,6 +196,14 @@ function viemToGasEstimator(client) {
|
|
|
181
196
|
|
|
182
197
|
// src/adapters/viem/resources/deposits/services/gas.ts
|
|
183
198
|
var DEFAULT_SAFE_NONBASE_L2_GAS_LIMIT = 3000000n;
|
|
199
|
+
async function estimatePriorityTxL2Gas(ctx, leg) {
|
|
200
|
+
if (!leg) return void 0;
|
|
201
|
+
try {
|
|
202
|
+
return await viemToGasEstimator(ctx.client.l2).estimatePriorityTxGas?.(leg);
|
|
203
|
+
} catch {
|
|
204
|
+
return void 0;
|
|
205
|
+
}
|
|
206
|
+
}
|
|
184
207
|
async function quoteL1Gas2(input) {
|
|
185
208
|
const { ctx, tx, overrides, fallbackGasLimit } = input;
|
|
186
209
|
const estimator = viemToGasEstimator(ctx.client.l1);
|
|
@@ -235,7 +258,12 @@ async function determineNonBaseL2Gas(input) {
|
|
|
235
258
|
return quoteL2Gas3({
|
|
236
259
|
ctx,
|
|
237
260
|
route,
|
|
238
|
-
overrideGasLimit:
|
|
261
|
+
overrideGasLimit: resolveRegisteredTokenPriorityL2GasLimit({
|
|
262
|
+
chainIdL2: ctx.chainIdL2,
|
|
263
|
+
priorityFloorGasLimit: input.priorityFloorGasLimit,
|
|
264
|
+
gasPerPubdata: ctx.gasPerPubdata,
|
|
265
|
+
nodeEstimate: await estimatePriorityTxL2Gas(ctx, input.priorityTxL2Leg)
|
|
266
|
+
})
|
|
239
267
|
});
|
|
240
268
|
}
|
|
241
269
|
const modelTx = {
|
|
@@ -272,6 +300,7 @@ async function determineEthNonBaseL2Gas(input) {
|
|
|
272
300
|
knownL2Token: input.ctx.resolvedToken?.l2,
|
|
273
301
|
modelTx: input.modelTx,
|
|
274
302
|
priorityFloorGasLimit: input.priorityFloorGasLimit,
|
|
303
|
+
priorityTxL2Leg: input.priorityTxL2Leg,
|
|
275
304
|
undeployedGasLimit: input.undeployedGasLimit
|
|
276
305
|
});
|
|
277
306
|
}
|
|
@@ -373,9 +402,13 @@ function routeEthDirect() {
|
|
|
373
402
|
l2Calldata,
|
|
374
403
|
gasPerPubdata: ctx.gasPerPubdata
|
|
375
404
|
});
|
|
376
|
-
const quotedL2GasLimit = ctx.l2GasLimit ??
|
|
377
|
-
|
|
378
|
-
|
|
405
|
+
const quotedL2GasLimit = ctx.l2GasLimit ?? clampPriorityL2GasLimit({
|
|
406
|
+
gasLimit: applyPriorityL2GasLimitBuffer({
|
|
407
|
+
chainIdL2: ctx.chainIdL2,
|
|
408
|
+
gasLimit: priorityFloorBreakdown.derivedL2GasLimit
|
|
409
|
+
}),
|
|
410
|
+
l2Calldata,
|
|
411
|
+
gasPerPubdata: ctx.gasPerPubdata
|
|
379
412
|
});
|
|
380
413
|
const l2GasParams = await quoteL2Gas3({
|
|
381
414
|
ctx,
|
|
@@ -521,26 +554,18 @@ var ntvCodec = createNTVCodec({
|
|
|
521
554
|
keccak256
|
|
522
555
|
});
|
|
523
556
|
async function encodeSecondBridgeErc20DepositCalldata(input) {
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
|
|
527
|
-
const l1ChainId = BigInt(await input.ctx.client.l1.getChainId());
|
|
528
|
-
const expectedL1AssetId = ntvCodec.encodeAssetId(
|
|
529
|
-
l1ChainId,
|
|
557
|
+
const registeredAssetId = input.ctx.resolvedToken?.assetId;
|
|
558
|
+
const assetId = registeredAssetId && registeredAssetId.toLowerCase() !== ZERO_ASSET_ID ? registeredAssetId : ntvCodec.encodeAssetId(
|
|
559
|
+
BigInt(await input.ctx.client.l1.getChainId()),
|
|
530
560
|
L2_NATIVE_TOKEN_VAULT_ADDRESS,
|
|
531
561
|
input.token
|
|
532
562
|
);
|
|
533
|
-
const assetId = input.ctx.resolvedToken.assetId.toLowerCase();
|
|
534
|
-
const isL1Origin = assetId === ZERO_ASSET_ID || assetId === expectedL1AssetId.toLowerCase();
|
|
535
|
-
if (isL1Origin) {
|
|
536
|
-
return encodeSecondBridgeErc20Args(input.token, input.amount, input.receiver);
|
|
537
|
-
}
|
|
538
563
|
const transferData = encodeNativeTokenVaultTransferData(
|
|
539
564
|
input.amount,
|
|
540
565
|
input.receiver,
|
|
541
566
|
input.token
|
|
542
567
|
);
|
|
543
|
-
return encodeSecondBridgeDataV1(
|
|
568
|
+
return encodeSecondBridgeDataV1(assetId, transferData);
|
|
544
569
|
}
|
|
545
570
|
async function getPriorityGasModel(input) {
|
|
546
571
|
try {
|
|
@@ -582,9 +607,18 @@ async function getPriorityGasModel(input) {
|
|
|
582
607
|
gasPerPubdata: input.ctx.gasPerPubdata
|
|
583
608
|
});
|
|
584
609
|
const model = {
|
|
585
|
-
|
|
586
|
-
|
|
587
|
-
|
|
610
|
+
priorityTxL2Leg: {
|
|
611
|
+
from: applyL1ToL2Alias(input.ctx.l1AssetRouter),
|
|
612
|
+
to: L2_ASSET_ROUTER_ADDRESS,
|
|
613
|
+
data: l2Calldata
|
|
614
|
+
},
|
|
615
|
+
priorityFloorGasLimit: clampPriorityL2GasLimit({
|
|
616
|
+
gasLimit: applyPriorityL2GasLimitBuffer({
|
|
617
|
+
chainIdL2: input.ctx.chainIdL2,
|
|
618
|
+
gasLimit: priorityFloorBreakdown.derivedL2GasLimit
|
|
619
|
+
}),
|
|
620
|
+
l2Calldata,
|
|
621
|
+
gasPerPubdata: input.ctx.gasPerPubdata
|
|
588
622
|
})
|
|
589
623
|
};
|
|
590
624
|
if (isFirstBridge || input.ctx.resolvedToken.l2.toLowerCase() === zeroAddress) {
|
|
@@ -627,6 +661,7 @@ function routeErc20NonBase() {
|
|
|
627
661
|
const baseToken = ctx.baseTokenL1 ?? await ctx.client.baseToken(ctx.chainIdL2);
|
|
628
662
|
const baseIsEth = ctx.baseIsEth ?? isETH(baseToken);
|
|
629
663
|
const assetRouter = ctx.l1AssetRouter;
|
|
664
|
+
const nativeTokenVault = ctx.l1NativeTokenVault;
|
|
630
665
|
const receiver = p.to ?? ctx.sender;
|
|
631
666
|
const secondBridgeCalldata = await wrapAs3(
|
|
632
667
|
"INTERNAL",
|
|
@@ -656,6 +691,7 @@ function routeErc20NonBase() {
|
|
|
656
691
|
ctx,
|
|
657
692
|
l1Token: p.token,
|
|
658
693
|
priorityFloorGasLimit: priorityGasModel.priorityFloorGasLimit,
|
|
694
|
+
priorityTxL2Leg: priorityGasModel.priorityTxL2Leg,
|
|
659
695
|
undeployedGasLimit: priorityGasModel.undeployedGasLimit,
|
|
660
696
|
modelTx: {
|
|
661
697
|
to: receiver,
|
|
@@ -676,10 +712,10 @@ function routeErc20NonBase() {
|
|
|
676
712
|
address: p.token,
|
|
677
713
|
abi: IERC20_default,
|
|
678
714
|
functionName: "allowance",
|
|
679
|
-
args: [ctx.sender,
|
|
715
|
+
args: [ctx.sender, nativeTokenVault]
|
|
680
716
|
}),
|
|
681
717
|
{
|
|
682
|
-
ctx: { where: "erc20.allowance", token: p.token, spender:
|
|
718
|
+
ctx: { where: "erc20.allowance", token: p.token, spender: nativeTokenVault },
|
|
683
719
|
message: "Failed to read deposit-token allowance."
|
|
684
720
|
}
|
|
685
721
|
);
|
|
@@ -690,7 +726,7 @@ function routeErc20NonBase() {
|
|
|
690
726
|
() => buildApprovalRequest({
|
|
691
727
|
ctx,
|
|
692
728
|
token: p.token,
|
|
693
|
-
spender:
|
|
729
|
+
spender: nativeTokenVault,
|
|
694
730
|
amount: p.amount
|
|
695
731
|
}),
|
|
696
732
|
{
|
|
@@ -698,9 +734,9 @@ function routeErc20NonBase() {
|
|
|
698
734
|
message: "Failed to simulate deposit token approve."
|
|
699
735
|
}
|
|
700
736
|
);
|
|
701
|
-
approvals.push({ token: p.token, spender:
|
|
737
|
+
approvals.push({ token: p.token, spender: nativeTokenVault, amount: p.amount });
|
|
702
738
|
steps.push({
|
|
703
|
-
key: `approve:${p.token}:${
|
|
739
|
+
key: `approve:${p.token}:${nativeTokenVault}`,
|
|
704
740
|
kind: "approve",
|
|
705
741
|
description: `Approve deposit token for amount`,
|
|
706
742
|
tx: approveTx
|
|
@@ -714,10 +750,10 @@ function routeErc20NonBase() {
|
|
|
714
750
|
address: baseToken,
|
|
715
751
|
abi: IERC20_default,
|
|
716
752
|
functionName: "allowance",
|
|
717
|
-
args: [ctx.sender,
|
|
753
|
+
args: [ctx.sender, nativeTokenVault]
|
|
718
754
|
}),
|
|
719
755
|
{
|
|
720
|
-
ctx: { where: "erc20.allowance", token: baseToken, spender:
|
|
756
|
+
ctx: { where: "erc20.allowance", token: baseToken, spender: nativeTokenVault },
|
|
721
757
|
message: "Failed to read base-token allowance."
|
|
722
758
|
}
|
|
723
759
|
);
|
|
@@ -728,7 +764,7 @@ function routeErc20NonBase() {
|
|
|
728
764
|
() => buildApprovalRequest({
|
|
729
765
|
ctx,
|
|
730
766
|
token: baseToken,
|
|
731
|
-
spender:
|
|
767
|
+
spender: nativeTokenVault,
|
|
732
768
|
amount: mintValue
|
|
733
769
|
}),
|
|
734
770
|
{
|
|
@@ -736,9 +772,9 @@ function routeErc20NonBase() {
|
|
|
736
772
|
message: "Failed to simulate base token approve."
|
|
737
773
|
}
|
|
738
774
|
);
|
|
739
|
-
approvals.push({ token: baseToken, spender:
|
|
775
|
+
approvals.push({ token: baseToken, spender: nativeTokenVault, amount: mintValue });
|
|
740
776
|
steps.push({
|
|
741
|
-
key: `approve:${baseToken}:${
|
|
777
|
+
key: `approve:${baseToken}:${nativeTokenVault}`,
|
|
742
778
|
kind: "approve",
|
|
743
779
|
description: `Approve base token for mintValue`,
|
|
744
780
|
tx: approveBaseTx
|
|
@@ -844,6 +880,20 @@ var ntvCodec2 = createNTVCodec({
|
|
|
844
880
|
),
|
|
845
881
|
keccak256: keccak256
|
|
846
882
|
});
|
|
883
|
+
async function encodeSecondBridgeEthDepositCalldata(input) {
|
|
884
|
+
const registeredAssetId = input.ctx.resolvedToken?.assetId;
|
|
885
|
+
const assetId = registeredAssetId && registeredAssetId.toLowerCase() !== ZERO_ASSET_ID2 ? registeredAssetId : ntvCodec2.encodeAssetId(
|
|
886
|
+
BigInt(await input.ctx.client.l1.getChainId()),
|
|
887
|
+
L2_NATIVE_TOKEN_VAULT_ADDRESS,
|
|
888
|
+
ETH_ADDRESS
|
|
889
|
+
);
|
|
890
|
+
const transferData = encodeNativeTokenVaultTransferData(
|
|
891
|
+
input.amount,
|
|
892
|
+
input.receiver,
|
|
893
|
+
ETH_ADDRESS
|
|
894
|
+
);
|
|
895
|
+
return encodeSecondBridgeDataV1(assetId, transferData);
|
|
896
|
+
}
|
|
847
897
|
async function getPriorityGasModel2(input) {
|
|
848
898
|
try {
|
|
849
899
|
const l1AssetRouter = await input.ctx.contracts.l1AssetRouter();
|
|
@@ -877,9 +927,18 @@ async function getPriorityGasModel2(input) {
|
|
|
877
927
|
gasPerPubdata: input.ctx.gasPerPubdata
|
|
878
928
|
});
|
|
879
929
|
const model = {
|
|
880
|
-
|
|
881
|
-
|
|
882
|
-
|
|
930
|
+
priorityTxL2Leg: {
|
|
931
|
+
from: applyL1ToL2Alias(input.ctx.l1AssetRouter),
|
|
932
|
+
to: L2_ASSET_ROUTER_ADDRESS,
|
|
933
|
+
data: l2Calldata
|
|
934
|
+
},
|
|
935
|
+
priorityFloorGasLimit: clampPriorityL2GasLimit({
|
|
936
|
+
gasLimit: applyPriorityL2GasLimitBuffer({
|
|
937
|
+
chainIdL2: input.ctx.chainIdL2,
|
|
938
|
+
gasLimit: priorityFloorBreakdown.derivedL2GasLimit
|
|
939
|
+
}),
|
|
940
|
+
l2Calldata,
|
|
941
|
+
gasPerPubdata: input.ctx.gasPerPubdata
|
|
883
942
|
})
|
|
884
943
|
};
|
|
885
944
|
if (input.ctx.resolvedToken.l2.toLowerCase() === zeroAddress) {
|
|
@@ -954,6 +1013,7 @@ function routeEthNonBase() {
|
|
|
954
1013
|
ctx,
|
|
955
1014
|
modelTx: l2TxModel,
|
|
956
1015
|
priorityFloorGasLimit: priorityGasModel.priorityFloorGasLimit,
|
|
1016
|
+
priorityTxL2Leg: priorityGasModel.priorityTxL2Leg,
|
|
957
1017
|
undeployedGasLimit: priorityGasModel.undeployedGasLimit
|
|
958
1018
|
});
|
|
959
1019
|
if (!l2Gas) throw new Error("Failed to estimate L2 gas parameters.");
|
|
@@ -968,10 +1028,10 @@ function routeEthNonBase() {
|
|
|
968
1028
|
address: baseToken,
|
|
969
1029
|
abi: IERC20_default,
|
|
970
1030
|
functionName: "allowance",
|
|
971
|
-
args: [ctx.sender, ctx.
|
|
1031
|
+
args: [ctx.sender, ctx.l1NativeTokenVault]
|
|
972
1032
|
}),
|
|
973
1033
|
{
|
|
974
|
-
ctx: { where: "erc20.allowance", token: baseToken, spender: ctx.
|
|
1034
|
+
ctx: { where: "erc20.allowance", token: baseToken, spender: ctx.l1NativeTokenVault },
|
|
975
1035
|
message: "Failed to read base-token allowance."
|
|
976
1036
|
}
|
|
977
1037
|
);
|
|
@@ -983,7 +1043,7 @@ function routeEthNonBase() {
|
|
|
983
1043
|
() => buildApprovalRequest({
|
|
984
1044
|
ctx,
|
|
985
1045
|
token: baseToken,
|
|
986
|
-
spender: ctx.
|
|
1046
|
+
spender: ctx.l1NativeTokenVault,
|
|
987
1047
|
amount: mintValue
|
|
988
1048
|
}),
|
|
989
1049
|
{
|
|
@@ -991,9 +1051,9 @@ function routeEthNonBase() {
|
|
|
991
1051
|
message: "Failed to simulate base-token approve."
|
|
992
1052
|
}
|
|
993
1053
|
);
|
|
994
|
-
approvals.push({ token: baseToken, spender: ctx.
|
|
1054
|
+
approvals.push({ token: baseToken, spender: ctx.l1NativeTokenVault, amount: mintValue });
|
|
995
1055
|
steps.push({
|
|
996
|
-
key: `approve:${baseToken}:${ctx.
|
|
1056
|
+
key: `approve:${baseToken}:${ctx.l1NativeTokenVault}`,
|
|
997
1057
|
kind: "approve",
|
|
998
1058
|
description: `Approve base token for fees (mintValue)`,
|
|
999
1059
|
tx: approveTx
|
|
@@ -1002,10 +1062,10 @@ function routeEthNonBase() {
|
|
|
1002
1062
|
const secondBridgeCalldata = await wrapAs4(
|
|
1003
1063
|
"INTERNAL",
|
|
1004
1064
|
OP_DEPOSITS.ethNonBase.encodeCalldata,
|
|
1005
|
-
() =>
|
|
1065
|
+
() => encodeSecondBridgeEthDepositCalldata({ ctx, amount: p.amount, receiver }),
|
|
1006
1066
|
{
|
|
1007
1067
|
ctx: {
|
|
1008
|
-
where: "
|
|
1068
|
+
where: "encodeSecondBridgeEthDepositCalldata",
|
|
1009
1069
|
amount: p.amount.toString(),
|
|
1010
1070
|
to: receiver
|
|
1011
1071
|
},
|
|
@@ -1146,9 +1206,13 @@ function routeErc20Base() {
|
|
|
1146
1206
|
l2Calldata,
|
|
1147
1207
|
gasPerPubdata: ctx.gasPerPubdata
|
|
1148
1208
|
});
|
|
1149
|
-
const quotedL2GasLimit = ctx.l2GasLimit ??
|
|
1150
|
-
|
|
1151
|
-
|
|
1209
|
+
const quotedL2GasLimit = ctx.l2GasLimit ?? clampPriorityL2GasLimit({
|
|
1210
|
+
gasLimit: applyPriorityL2GasLimitBuffer({
|
|
1211
|
+
chainIdL2: ctx.chainIdL2,
|
|
1212
|
+
gasLimit: priorityFloorBreakdown.derivedL2GasLimit
|
|
1213
|
+
}),
|
|
1214
|
+
l2Calldata,
|
|
1215
|
+
gasPerPubdata: ctx.gasPerPubdata
|
|
1152
1216
|
});
|
|
1153
1217
|
const l2Gas = await quoteL2Gas3({
|
|
1154
1218
|
ctx,
|
|
@@ -1167,10 +1231,10 @@ function routeErc20Base() {
|
|
|
1167
1231
|
address: baseToken,
|
|
1168
1232
|
abi: IERC20_default,
|
|
1169
1233
|
functionName: "allowance",
|
|
1170
|
-
args: [ctx.sender, ctx.
|
|
1234
|
+
args: [ctx.sender, ctx.l1NativeTokenVault]
|
|
1171
1235
|
}),
|
|
1172
1236
|
{
|
|
1173
|
-
ctx: { where: "erc20.allowance", token: baseToken, spender: ctx.
|
|
1237
|
+
ctx: { where: "erc20.allowance", token: baseToken, spender: ctx.l1NativeTokenVault },
|
|
1174
1238
|
message: "Failed to read base-token allowance."
|
|
1175
1239
|
}
|
|
1176
1240
|
);
|
|
@@ -1182,7 +1246,7 @@ function routeErc20Base() {
|
|
|
1182
1246
|
() => buildApprovalRequest({
|
|
1183
1247
|
ctx,
|
|
1184
1248
|
token: baseToken,
|
|
1185
|
-
spender: ctx.
|
|
1249
|
+
spender: ctx.l1NativeTokenVault,
|
|
1186
1250
|
amount: mintValue
|
|
1187
1251
|
}),
|
|
1188
1252
|
{
|
|
@@ -1190,9 +1254,9 @@ function routeErc20Base() {
|
|
|
1190
1254
|
message: "Failed to simulate ERC-20 approve."
|
|
1191
1255
|
}
|
|
1192
1256
|
);
|
|
1193
|
-
approvals.push({ token: baseToken, spender: ctx.
|
|
1257
|
+
approvals.push({ token: baseToken, spender: ctx.l1NativeTokenVault, amount: mintValue });
|
|
1194
1258
|
steps.push({
|
|
1195
|
-
key: `approve:${baseToken}:${ctx.
|
|
1259
|
+
key: `approve:${baseToken}:${ctx.l1NativeTokenVault}`,
|
|
1196
1260
|
kind: "approve",
|
|
1197
1261
|
description: "Approve base token for mintValue",
|
|
1198
1262
|
tx: approveTx
|
|
@@ -1438,8 +1502,17 @@ function createTokensResource(client) {
|
|
|
1438
1502
|
const chainId = BigInt(await client.l2.getChainId());
|
|
1439
1503
|
return await client.baseToken(chainId);
|
|
1440
1504
|
}
|
|
1441
|
-
const {
|
|
1442
|
-
const
|
|
1505
|
+
const { l2NativeTokenVault, l1NativeTokenVault } = await client.contracts();
|
|
1506
|
+
const assetId = await l2NativeTokenVault.read.assetId([l2Token]);
|
|
1507
|
+
if (BigInt(assetId) === 0n) {
|
|
1508
|
+
throw new Error(`Token ${l2Token} is not registered in the L2 NativeTokenVault.`);
|
|
1509
|
+
}
|
|
1510
|
+
const l1Token = await l1NativeTokenVault.read.tokenAddress([assetId]);
|
|
1511
|
+
if (BigInt(l1Token) === 0n) {
|
|
1512
|
+
throw new Error(
|
|
1513
|
+
`Token ${l2Token} has no L1 counterpart registered in the L1 NativeTokenVault.`
|
|
1514
|
+
);
|
|
1515
|
+
}
|
|
1443
1516
|
return l1Token;
|
|
1444
1517
|
});
|
|
1445
1518
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { createErrorOps, REVERT_TO_READINESS } from './chunk-
|
|
2
|
-
import { IL1Nullifier_default, IERC20_default, L1NativeTokenVault_default, L2NativeTokenVault_default, Mailbox_default, IL1ContractErrors_default, IInteropErrors_default } from './chunk-
|
|
1
|
+
import { createErrorOps, REVERT_TO_READINESS } from './chunk-4ZANKNIK.js';
|
|
2
|
+
import { IL1Nullifier_default, IERC20_default, L1NativeTokenVault_default, L2NativeTokenVault_default, Mailbox_default, IL1ContractErrors_default, IInteropErrors_default } from './chunk-JNS4XZE2.js';
|
|
3
3
|
import { Interface } from 'ethers';
|
|
4
4
|
|
|
5
5
|
var ERROR_IFACES = [];
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { createErrorHandlers } from './chunk-
|
|
1
|
+
import { createErrorHandlers } from './chunk-H5A6GU3D.js';
|
|
2
2
|
import { unpackSemver } from './chunk-UMPAKZCQ.js';
|
|
3
3
|
import { makeTransportFromViem } from './chunk-BWKWWLY4.js';
|
|
4
|
-
import { OP_CLIENT, IBridgehub_default, IL1AssetRouter_default, IL1Nullifier_default, IBaseToken_default, L2NativeTokenVault_default, IL2AssetRouter_default, L1NativeTokenVault_default, createError, createZksRpc } from './chunk-
|
|
5
|
-
import { L2_ASSET_ROUTER_ADDRESS, L2_NATIVE_TOKEN_VAULT_ADDRESS, L2_BASE_TOKEN_ADDRESS, L2_INTEROP_CENTER_ADDRESS, L2_INTEROP_HANDLER_ADDRESS, L2_MESSAGE_VERIFICATION_ADDRESS, FORMAL_ETH_ADDRESS } from './chunk-
|
|
4
|
+
import { OP_CLIENT, IBridgehub_default, IL1AssetRouter_default, IL1Nullifier_default, IBaseToken_default, L2NativeTokenVault_default, IL2AssetRouter_default, L1NativeTokenVault_default, createError, createZksRpc } from './chunk-JNS4XZE2.js';
|
|
5
|
+
import { L2_ASSET_ROUTER_ADDRESS, L2_NATIVE_TOKEN_VAULT_ADDRESS, L2_BASE_TOKEN_ADDRESS, L2_INTEROP_CENTER_ADDRESS, L2_INTEROP_HANDLER_ADDRESS, L2_MESSAGE_VERIFICATION_ADDRESS, FORMAL_ETH_ADDRESS } from './chunk-3IPSDGHO.js';
|
|
6
6
|
import { getContract, createWalletClient, custom } from 'viem';
|
|
7
7
|
|
|
8
8
|
// src/adapters/viem/rpc.ts
|
|
@@ -16,6 +16,8 @@ export interface GasEstimator {
|
|
|
16
16
|
gasPrice?: bigint;
|
|
17
17
|
}>;
|
|
18
18
|
getGasPrice(): Promise<bigint>;
|
|
19
|
+
/** Estimate `tx` as an L1->L2 priority tx; rejects when the node cannot simulate that tx type. */
|
|
20
|
+
estimatePriorityTxGas?(tx: CoreTransactionRequest): Promise<bigint>;
|
|
19
21
|
call(tx: {
|
|
20
22
|
to: Address;
|
|
21
23
|
data?: string;
|
package/dist/core/constants.cjs
CHANGED
|
@@ -37,6 +37,14 @@ var L1_TX_DELTA_FACTORY_DEPS_L2_GAS = 2473n;
|
|
|
37
37
|
var L1_TX_DELTA_FACTORY_DEPS_PUBDATA = 64n;
|
|
38
38
|
var TX_SLOT_OVERHEAD_L2_GAS = 10000n;
|
|
39
39
|
var PRIORITY_TX_MAX_GAS_LIMIT = 72000000n;
|
|
40
|
+
var L1_TX_INTRINSIC_L2_GAS_ZKSYNC_OS = 21000n;
|
|
41
|
+
var L1_TX_CALLDATA_FLOOR_PRICE_L2_GAS_ZKSYNC_OS = 40n;
|
|
42
|
+
var L1_TX_INTRINSIC_PUBDATA_ZKSYNC_OS = 351n;
|
|
43
|
+
var MAX_NATIVE_COMPUTATIONAL_ZKSYNC_OS = 1n << 35n;
|
|
44
|
+
var L1_TX_NATIVE_PER_GAS = 100000000n;
|
|
45
|
+
var ZKSYNC_OS_PRIORITY_TX_TYPE = "0x7f";
|
|
46
|
+
var REGISTERED_TOKEN_BRIDGE_MINT_EXECUTION_GAS = 140000n;
|
|
47
|
+
var REGISTERED_TOKEN_BRIDGE_MINT_PUBDATA_BYTES = 300n;
|
|
40
48
|
var L1_FEE_ESTIMATION_COEF_NUMERATOR = 12;
|
|
41
49
|
var L1_FEE_ESTIMATION_COEF_DENOMINATOR = 10;
|
|
42
50
|
|
|
@@ -50,12 +58,16 @@ exports.L1_FEE_ESTIMATION_COEF_DENOMINATOR = L1_FEE_ESTIMATION_COEF_DENOMINATOR;
|
|
|
50
58
|
exports.L1_FEE_ESTIMATION_COEF_NUMERATOR = L1_FEE_ESTIMATION_COEF_NUMERATOR;
|
|
51
59
|
exports.L1_MESSENGER_ADDRESS = L1_MESSENGER_ADDRESS;
|
|
52
60
|
exports.L1_SOPH_TOKEN_ADDRESS = L1_SOPH_TOKEN_ADDRESS;
|
|
61
|
+
exports.L1_TX_CALLDATA_FLOOR_PRICE_L2_GAS_ZKSYNC_OS = L1_TX_CALLDATA_FLOOR_PRICE_L2_GAS_ZKSYNC_OS;
|
|
53
62
|
exports.L1_TX_DELTA_544_ENCODING_BYTES = L1_TX_DELTA_544_ENCODING_BYTES;
|
|
54
63
|
exports.L1_TX_DELTA_FACTORY_DEPS_L2_GAS = L1_TX_DELTA_FACTORY_DEPS_L2_GAS;
|
|
55
64
|
exports.L1_TX_DELTA_FACTORY_DEPS_PUBDATA = L1_TX_DELTA_FACTORY_DEPS_PUBDATA;
|
|
56
65
|
exports.L1_TX_INTRINSIC_L2_GAS = L1_TX_INTRINSIC_L2_GAS;
|
|
66
|
+
exports.L1_TX_INTRINSIC_L2_GAS_ZKSYNC_OS = L1_TX_INTRINSIC_L2_GAS_ZKSYNC_OS;
|
|
57
67
|
exports.L1_TX_INTRINSIC_PUBDATA = L1_TX_INTRINSIC_PUBDATA;
|
|
68
|
+
exports.L1_TX_INTRINSIC_PUBDATA_ZKSYNC_OS = L1_TX_INTRINSIC_PUBDATA_ZKSYNC_OS;
|
|
58
69
|
exports.L1_TX_MIN_L2_GAS_BASE = L1_TX_MIN_L2_GAS_BASE;
|
|
70
|
+
exports.L1_TX_NATIVE_PER_GAS = L1_TX_NATIVE_PER_GAS;
|
|
59
71
|
exports.L2_ASSET_ROUTER_ADDRESS = L2_ASSET_ROUTER_ADDRESS;
|
|
60
72
|
exports.L2_BASE_TOKEN_ADDRESS = L2_BASE_TOKEN_ADDRESS;
|
|
61
73
|
exports.L2_INTEROP_ATTRIBUTE_PARSER_ADDRESS = L2_INTEROP_ATTRIBUTE_PARSER_ADDRESS;
|
|
@@ -64,7 +76,10 @@ exports.L2_INTEROP_HANDLER_ADDRESS = L2_INTEROP_HANDLER_ADDRESS;
|
|
|
64
76
|
exports.L2_INTEROP_ROOT_STORAGE_ADDRESS = L2_INTEROP_ROOT_STORAGE_ADDRESS;
|
|
65
77
|
exports.L2_MESSAGE_VERIFICATION_ADDRESS = L2_MESSAGE_VERIFICATION_ADDRESS;
|
|
66
78
|
exports.L2_NATIVE_TOKEN_VAULT_ADDRESS = L2_NATIVE_TOKEN_VAULT_ADDRESS;
|
|
79
|
+
exports.MAX_NATIVE_COMPUTATIONAL_ZKSYNC_OS = MAX_NATIVE_COMPUTATIONAL_ZKSYNC_OS;
|
|
67
80
|
exports.PRIORITY_TX_MAX_GAS_LIMIT = PRIORITY_TX_MAX_GAS_LIMIT;
|
|
81
|
+
exports.REGISTERED_TOKEN_BRIDGE_MINT_EXECUTION_GAS = REGISTERED_TOKEN_BRIDGE_MINT_EXECUTION_GAS;
|
|
82
|
+
exports.REGISTERED_TOKEN_BRIDGE_MINT_PUBDATA_BYTES = REGISTERED_TOKEN_BRIDGE_MINT_PUBDATA_BYTES;
|
|
68
83
|
exports.SAFE_L1_BRIDGE_GAS = SAFE_L1_BRIDGE_GAS;
|
|
69
84
|
exports.TOPIC_CANONICAL_ASSIGNED = TOPIC_CANONICAL_ASSIGNED;
|
|
70
85
|
exports.TOPIC_CANONICAL_SUCCESS = TOPIC_CANONICAL_SUCCESS;
|
|
@@ -74,6 +89,7 @@ exports.TOPIC_L1_MESSAGE_SENT_NEW = TOPIC_L1_MESSAGE_SENT_NEW;
|
|
|
74
89
|
exports.TX_MEMORY_OVERHEAD_GAS = TX_MEMORY_OVERHEAD_GAS;
|
|
75
90
|
exports.TX_OVERHEAD_GAS = TX_OVERHEAD_GAS;
|
|
76
91
|
exports.TX_SLOT_OVERHEAD_L2_GAS = TX_SLOT_OVERHEAD_L2_GAS;
|
|
92
|
+
exports.ZKSYNC_OS_PRIORITY_TX_TYPE = ZKSYNC_OS_PRIORITY_TX_TYPE;
|
|
77
93
|
exports.k256hex = k256hex;
|
|
78
94
|
//# sourceMappingURL=constants.cjs.map
|
|
79
95
|
//# sourceMappingURL=constants.cjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/core/constants.ts"],"names":["bytesToHex","keccak_256","utf8ToBytes"],"mappings":";;;;;;AAQO,IAAM,OAAA,GAAU,CAAC,CAAA,KACtB,CAAA,EAAA,EAAKA,gBAAA,CAAWC,eAAA,CAAWC,iBAAA,CAAY,CAAC,CAAC,CAAC,CAAC,CAAA,CAAA,CAAG,WAAA;AAOzC,IAAM,kBAAA,GAA8B;AAGpC,IAAM,WAAA,GAAuB;AAG7B,IAAM,uBAAA,GAAmC;AAGzC,IAAM,6BAAA,GAAyC;AAG/C,IAAM,oBAAA,GAAgC;AAGtC,IAAM,qBAAA,GAAiC;AAGvC,IAAM,yBAAA,GAAqC;AAG3C,IAAM,0BAAA,GAAsC;AAG5C,IAAM,+BAAA,GACX;AAUK,IAAM,mCAAA,GACX;AAGK,IAAM,+BAAA,GACX;AAGK,IAAM,qBAAA,GAAiC;AAGvC,IAAM,iBAAA,GAAyB;AAO/B,IAAM,qBAAA,GACX;AAGK,IAAM,yBAAA,GAAiC,QAAQ,sCAAsC;AAGrF,IAAM,yBAAA,GAAiC,QAAQ,sCAAsC;AAGrF,IAAM,wBAAA,GACX;AAGK,IAAM,uBAAA,GACX;AAQK,IAAM,MAAA,GAAS;AAEf,IAAM,eAAA,GAAkB;AAExB,IAAM,sBAAA,GAAyB;AAE/B,IAAM,qBAAA,GAAwB;AAE9B,IAAM,iBAAA,GAAoB;AAE1B,IAAM,kBAAA,GAAqB;AAQ3B,IAAM,sBAAA,GAAyB;AAC/B,IAAM,uBAAA,GAA0B;AAChC,IAAM,qBAAA,GAAwB;AAC9B,IAAM,8BAAA,GAAiC;AACvC,IAAM,+BAAA,GAAkC;AACxC,IAAM,gCAAA,GAAmC;AACzC,IAAM,uBAAA,GAA0B;AAChC,IAAM,yBAAA,GAA4B;
|
|
1
|
+
{"version":3,"sources":["../../src/core/constants.ts"],"names":["bytesToHex","keccak_256","utf8ToBytes"],"mappings":";;;;;;AAQO,IAAM,OAAA,GAAU,CAAC,CAAA,KACtB,CAAA,EAAA,EAAKA,gBAAA,CAAWC,eAAA,CAAWC,iBAAA,CAAY,CAAC,CAAC,CAAC,CAAC,CAAA,CAAA,CAAG,WAAA;AAOzC,IAAM,kBAAA,GAA8B;AAGpC,IAAM,WAAA,GAAuB;AAG7B,IAAM,uBAAA,GAAmC;AAGzC,IAAM,6BAAA,GAAyC;AAG/C,IAAM,oBAAA,GAAgC;AAGtC,IAAM,qBAAA,GAAiC;AAGvC,IAAM,yBAAA,GAAqC;AAG3C,IAAM,0BAAA,GAAsC;AAG5C,IAAM,+BAAA,GACX;AAUK,IAAM,mCAAA,GACX;AAGK,IAAM,+BAAA,GACX;AAGK,IAAM,qBAAA,GAAiC;AAGvC,IAAM,iBAAA,GAAyB;AAO/B,IAAM,qBAAA,GACX;AAGK,IAAM,yBAAA,GAAiC,QAAQ,sCAAsC;AAGrF,IAAM,yBAAA,GAAiC,QAAQ,sCAAsC;AAGrF,IAAM,wBAAA,GACX;AAGK,IAAM,uBAAA,GACX;AAQK,IAAM,MAAA,GAAS;AAEf,IAAM,eAAA,GAAkB;AAExB,IAAM,sBAAA,GAAyB;AAE/B,IAAM,qBAAA,GAAwB;AAE9B,IAAM,iBAAA,GAAoB;AAE1B,IAAM,kBAAA,GAAqB;AAQ3B,IAAM,sBAAA,GAAyB;AAC/B,IAAM,uBAAA,GAA0B;AAChC,IAAM,qBAAA,GAAwB;AAC9B,IAAM,8BAAA,GAAiC;AACvC,IAAM,+BAAA,GAAkC;AACxC,IAAM,gCAAA,GAAmC;AACzC,IAAM,uBAAA,GAA0B;AAChC,IAAM,yBAAA,GAA4B;AAGlC,IAAM,gCAAA,GAAmC;AACzC,IAAM,2CAAA,GAA8C;AACpD,IAAM,iCAAA,GAAoC;AAC1C,IAAM,qCAAqC,EAAA,IAAM;AACjD,IAAM,oBAAA,GAAuB;AAG7B,IAAM,0BAAA,GAA6B;AAKnC,IAAM,0CAAA,GAA6C;AACnD,IAAM,0CAAA,GAA6C;AAMnD,IAAM,gCAAA,GAAmC;AAMzC,IAAM,kCAAA,GAAqC","file":"constants.cjs"}
|
package/dist/core/constants.d.ts
CHANGED
|
@@ -57,6 +57,14 @@ export declare const L1_TX_DELTA_FACTORY_DEPS_L2_GAS = 2473n;
|
|
|
57
57
|
export declare const L1_TX_DELTA_FACTORY_DEPS_PUBDATA = 64n;
|
|
58
58
|
export declare const TX_SLOT_OVERHEAD_L2_GAS = 10000n;
|
|
59
59
|
export declare const PRIORITY_TX_MAX_GAS_LIMIT = 72000000n;
|
|
60
|
+
export declare const L1_TX_INTRINSIC_L2_GAS_ZKSYNC_OS = 21000n;
|
|
61
|
+
export declare const L1_TX_CALLDATA_FLOOR_PRICE_L2_GAS_ZKSYNC_OS = 40n;
|
|
62
|
+
export declare const L1_TX_INTRINSIC_PUBDATA_ZKSYNC_OS = 351n;
|
|
63
|
+
export declare const MAX_NATIVE_COMPUTATIONAL_ZKSYNC_OS: bigint;
|
|
64
|
+
export declare const L1_TX_NATIVE_PER_GAS = 100000000n;
|
|
65
|
+
export declare const ZKSYNC_OS_PRIORITY_TX_TYPE = "0x7f";
|
|
66
|
+
export declare const REGISTERED_TOKEN_BRIDGE_MINT_EXECUTION_GAS = 140000n;
|
|
67
|
+
export declare const REGISTERED_TOKEN_BRIDGE_MINT_PUBDATA_BYTES = 300n;
|
|
60
68
|
/**
|
|
61
69
|
* Numerator used in scaling the gas limit to help ensure acceptance of L1->L2 txs.
|
|
62
70
|
* Used with {@link L1_FEE_ESTIMATION_COEF_DENOMINATOR}.
|
package/dist/core/constants.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export { BUFFER, BUNDLE_IDENTIFIER, DEFAULT_ABI_BYTES, DEFAULT_PUBDATA_BYTES, ETH_ADDRESS, FORMAL_ETH_ADDRESS, L1_FEE_ESTIMATION_COEF_DENOMINATOR, L1_FEE_ESTIMATION_COEF_NUMERATOR, L1_MESSENGER_ADDRESS, L1_SOPH_TOKEN_ADDRESS, L1_TX_DELTA_544_ENCODING_BYTES, L1_TX_DELTA_FACTORY_DEPS_L2_GAS, L1_TX_DELTA_FACTORY_DEPS_PUBDATA, L1_TX_INTRINSIC_L2_GAS, L1_TX_INTRINSIC_PUBDATA, L1_TX_MIN_L2_GAS_BASE, L2_ASSET_ROUTER_ADDRESS, L2_BASE_TOKEN_ADDRESS, L2_INTEROP_ATTRIBUTE_PARSER_ADDRESS, L2_INTEROP_CENTER_ADDRESS, L2_INTEROP_HANDLER_ADDRESS, L2_INTEROP_ROOT_STORAGE_ADDRESS, L2_MESSAGE_VERIFICATION_ADDRESS, L2_NATIVE_TOKEN_VAULT_ADDRESS, PRIORITY_TX_MAX_GAS_LIMIT, SAFE_L1_BRIDGE_GAS, TOPIC_CANONICAL_ASSIGNED, TOPIC_CANONICAL_SUCCESS, TOPIC_L1_MESSAGE_SENT, TOPIC_L1_MESSAGE_SENT_LEG, TOPIC_L1_MESSAGE_SENT_NEW, TX_MEMORY_OVERHEAD_GAS, TX_OVERHEAD_GAS, TX_SLOT_OVERHEAD_L2_GAS, k256hex } from '../chunk-
|
|
1
|
+
export { BUFFER, BUNDLE_IDENTIFIER, DEFAULT_ABI_BYTES, DEFAULT_PUBDATA_BYTES, ETH_ADDRESS, FORMAL_ETH_ADDRESS, L1_FEE_ESTIMATION_COEF_DENOMINATOR, L1_FEE_ESTIMATION_COEF_NUMERATOR, L1_MESSENGER_ADDRESS, L1_SOPH_TOKEN_ADDRESS, L1_TX_CALLDATA_FLOOR_PRICE_L2_GAS_ZKSYNC_OS, L1_TX_DELTA_544_ENCODING_BYTES, L1_TX_DELTA_FACTORY_DEPS_L2_GAS, L1_TX_DELTA_FACTORY_DEPS_PUBDATA, L1_TX_INTRINSIC_L2_GAS, L1_TX_INTRINSIC_L2_GAS_ZKSYNC_OS, L1_TX_INTRINSIC_PUBDATA, L1_TX_INTRINSIC_PUBDATA_ZKSYNC_OS, L1_TX_MIN_L2_GAS_BASE, L1_TX_NATIVE_PER_GAS, L2_ASSET_ROUTER_ADDRESS, L2_BASE_TOKEN_ADDRESS, L2_INTEROP_ATTRIBUTE_PARSER_ADDRESS, L2_INTEROP_CENTER_ADDRESS, L2_INTEROP_HANDLER_ADDRESS, L2_INTEROP_ROOT_STORAGE_ADDRESS, L2_MESSAGE_VERIFICATION_ADDRESS, L2_NATIVE_TOKEN_VAULT_ADDRESS, MAX_NATIVE_COMPUTATIONAL_ZKSYNC_OS, PRIORITY_TX_MAX_GAS_LIMIT, REGISTERED_TOKEN_BRIDGE_MINT_EXECUTION_GAS, REGISTERED_TOKEN_BRIDGE_MINT_PUBDATA_BYTES, SAFE_L1_BRIDGE_GAS, TOPIC_CANONICAL_ASSIGNED, TOPIC_CANONICAL_SUCCESS, TOPIC_L1_MESSAGE_SENT, TOPIC_L1_MESSAGE_SENT_LEG, TOPIC_L1_MESSAGE_SENT_NEW, TX_MEMORY_OVERHEAD_GAS, TX_OVERHEAD_GAS, TX_SLOT_OVERHEAD_L2_GAS, ZKSYNC_OS_PRIORITY_TX_TYPE, k256hex } from '../chunk-3IPSDGHO.js';
|
package/dist/core/index.cjs
CHANGED
|
@@ -3075,13 +3075,6 @@ var IL2AssetRouterABI = [
|
|
|
3075
3075
|
outputs: [{ name: "", type: "address", internalType: "address" }],
|
|
3076
3076
|
stateMutability: "view"
|
|
3077
3077
|
},
|
|
3078
|
-
{
|
|
3079
|
-
type: "function",
|
|
3080
|
-
name: "l1TokenAddress",
|
|
3081
|
-
inputs: [{ name: "_l2Token", type: "address", internalType: "address" }],
|
|
3082
|
-
outputs: [{ name: "", type: "address", internalType: "address" }],
|
|
3083
|
-
stateMutability: "view"
|
|
3084
|
-
},
|
|
3085
3078
|
{
|
|
3086
3079
|
type: "function",
|
|
3087
3080
|
name: "l2TokenAddress",
|