@matterlabs/zksync-js 0.0.21 → 0.0.22
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 +31 -1
- package/dist/adapters/ethers/client.cjs.map +1 -1
- package/dist/adapters/ethers/client.d.ts +11 -0
- package/dist/adapters/ethers/client.js +6 -5
- package/dist/adapters/ethers/index.cjs +1009 -274
- package/dist/adapters/ethers/index.cjs.map +1 -1
- package/dist/adapters/ethers/index.d.ts +2 -1
- package/dist/adapters/ethers/index.js +10 -8
- package/dist/adapters/ethers/resources/withdrawals/context.d.ts +12 -1
- package/dist/adapters/ethers/resources/withdrawals/index.d.ts +17 -1
- package/dist/adapters/ethers/resources/withdrawals/routes/interop-bundle.d.ts +2 -0
- package/dist/adapters/ethers/resources/withdrawals/services/finalization.d.ts +35 -17
- package/dist/adapters/ethers/resources/withdrawals/services/protocol.d.ts +11 -0
- package/dist/adapters/ethers/sdk.cjs +976 -272
- package/dist/adapters/ethers/sdk.cjs.map +1 -1
- package/dist/adapters/ethers/sdk.d.ts +3 -1
- package/dist/adapters/ethers/sdk.js +8 -7
- package/dist/adapters/viem/client.cjs +44 -0
- package/dist/adapters/viem/client.cjs.map +1 -1
- package/dist/adapters/viem/client.d.ts +11 -0
- package/dist/adapters/viem/client.js +6 -5
- package/dist/adapters/viem/index.cjs +1060 -294
- package/dist/adapters/viem/index.cjs.map +1 -1
- package/dist/adapters/viem/index.d.ts +2 -1
- package/dist/adapters/viem/index.js +10 -8
- package/dist/adapters/viem/resources/withdrawals/context.d.ts +12 -1
- package/dist/adapters/viem/resources/withdrawals/index.d.ts +17 -1
- package/dist/adapters/viem/resources/withdrawals/routes/interop-bundle.d.ts +2 -0
- package/dist/adapters/viem/resources/withdrawals/services/finalization.d.ts +36 -18
- package/dist/adapters/viem/resources/withdrawals/services/protocol.d.ts +11 -0
- package/dist/adapters/viem/sdk.cjs +1014 -293
- package/dist/adapters/viem/sdk.cjs.map +1 -1
- package/dist/adapters/viem/sdk.d.ts +3 -1
- package/dist/adapters/viem/sdk.js +8 -7
- package/dist/{chunk-SBGBYZJM.js → chunk-2D3FBCZC.js} +2 -2
- package/dist/{chunk-LGTYM5XP.js → chunk-32N6TI6K.js} +1 -1
- package/dist/{chunk-IDXSGCGF.js → chunk-3SPDWWRD.js} +7 -22
- package/dist/{chunk-7GZDTLHX.js → chunk-4K4LOCQJ.js} +559 -256
- package/dist/{chunk-UEKFQAOS.js → chunk-AMRHBZIY.js} +304 -2
- package/dist/{chunk-2CGBLD5H.js → chunk-CP4SQ5PM.js} +527 -239
- package/dist/{chunk-NJK325XV.js → chunk-CPNHKNI4.js} +2 -2
- package/dist/{chunk-TYYUG5GA.js → chunk-CUBUD4J4.js} +1 -1
- package/dist/{chunk-CK5UFAZK.js → chunk-JXBLQQEN.js} +37 -3
- package/dist/{chunk-JSBMIT4S.js → chunk-KL6ZCPWJ.js} +1 -1
- package/dist/{chunk-MT4X5FEO.js → chunk-NQRYXL3K.js} +3 -1
- package/dist/{chunk-24TE2NNJ.js → chunk-PI4PF6WT.js} +24 -4
- package/dist/chunk-QUAPG3ZR.js +157 -0
- package/dist/chunk-UMPAKZCQ.js +19 -0
- package/dist/core/abi.d.ts +1 -0
- package/dist/core/constants.cjs +2 -0
- package/dist/core/constants.cjs.map +1 -1
- package/dist/core/constants.d.ts +9 -0
- package/dist/core/constants.js +1 -1
- package/dist/core/index.cjs +504 -0
- package/dist/core/index.cjs.map +1 -1
- package/dist/core/index.d.ts +6 -1
- package/dist/core/index.js +6 -4
- package/dist/core/internal/abis/IERC7786Attributes.d.ts +10 -0
- package/dist/core/internal/abis/IL1NullifierV32.d.ts +221 -0
- package/dist/core/resources/interop/attributes/bundle.d.ts +1 -0
- package/dist/core/resources/interop/attributes/resource.d.ts +1 -0
- package/dist/core/resources/protocol/semver.d.ts +18 -0
- package/dist/core/resources/withdrawals/bundle.d.ts +80 -0
- package/dist/core/resources/withdrawals/finalization.d.ts +142 -0
- package/dist/core/resources/withdrawals/protocol.d.ts +55 -0
- package/dist/core/types/flows/withdrawals.d.ts +30 -0
- package/dist/index.cjs +304 -0
- package/dist/index.cjs.map +1 -1
- package/dist/index.js +4 -4
- package/package.json +1 -1
|
@@ -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-KL6ZCPWJ.js';
|
|
2
|
+
import { IL1Nullifier_default, IERC20_default, L1NativeTokenVault_default, L2NativeTokenVault_default, Mailbox_default, IL1ContractErrors_default, IInteropErrors_default } from './chunk-AMRHBZIY.js';
|
|
3
3
|
import { Interface } from 'ethers';
|
|
4
4
|
|
|
5
5
|
var ERROR_IFACES = [];
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import { createErrorHandlers } from './chunk-
|
|
1
|
+
import { createErrorHandlers } from './chunk-2D3FBCZC.js';
|
|
2
|
+
import { unpackSemver } from './chunk-UMPAKZCQ.js';
|
|
2
3
|
import { makeTransportFromViem } from './chunk-BWKWWLY4.js';
|
|
3
|
-
import { OP_CLIENT, IBridgehub_default, IL1AssetRouter_default, IL1Nullifier_default, IBaseToken_default, L2NativeTokenVault_default, IL2AssetRouter_default, L1NativeTokenVault_default, createError, createZksRpc } from './chunk-
|
|
4
|
-
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-AMRHBZIY.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-NQRYXL3K.js';
|
|
5
6
|
import { getContract, createWalletClient, custom } from 'viem';
|
|
6
7
|
|
|
7
8
|
// src/adapters/viem/rpc.ts
|
|
@@ -21,6 +22,15 @@ var ChainTypeManagerABI = [
|
|
|
21
22
|
inputs: [],
|
|
22
23
|
outputs: [{ type: "uint32" }, { type: "uint32" }, { type: "uint32" }],
|
|
23
24
|
stateMutability: "view"
|
|
25
|
+
},
|
|
26
|
+
{
|
|
27
|
+
// Per-chain version. `getSemverProtocolVersion` reports the CTM's own (latest) version, which
|
|
28
|
+
// runs ahead of individual chains mid-upgrade — so capability gating must use this one.
|
|
29
|
+
type: "function",
|
|
30
|
+
name: "getProtocolVersion",
|
|
31
|
+
inputs: [{ name: "_chainId", type: "uint256" }],
|
|
32
|
+
outputs: [{ type: "uint256" }],
|
|
33
|
+
stateMutability: "view"
|
|
24
34
|
}
|
|
25
35
|
];
|
|
26
36
|
function createViemClient(args) {
|
|
@@ -161,6 +171,29 @@ function createViemClient(args) {
|
|
|
161
171
|
);
|
|
162
172
|
return semver;
|
|
163
173
|
}
|
|
174
|
+
async function getChainProtocolVersion(chainId) {
|
|
175
|
+
try {
|
|
176
|
+
const targetChainId = chainId ?? BigInt(await l2.getChainId());
|
|
177
|
+
const { bridgehub } = await ensureAddresses();
|
|
178
|
+
const chainTypeManager = await l1.readContract({
|
|
179
|
+
address: bridgehub,
|
|
180
|
+
abi: IBridgehub_default,
|
|
181
|
+
functionName: "chainTypeManager",
|
|
182
|
+
args: [targetChainId]
|
|
183
|
+
});
|
|
184
|
+
if (chainTypeManager.toLowerCase() === FORMAL_ETH_ADDRESS.toLowerCase()) return void 0;
|
|
185
|
+
const packed = await l1.readContract({
|
|
186
|
+
address: chainTypeManager,
|
|
187
|
+
abi: ChainTypeManagerABI,
|
|
188
|
+
functionName: "getProtocolVersion",
|
|
189
|
+
args: [targetChainId]
|
|
190
|
+
});
|
|
191
|
+
if (packed === 0n) return void 0;
|
|
192
|
+
return unpackSemver(packed);
|
|
193
|
+
} catch {
|
|
194
|
+
return void 0;
|
|
195
|
+
}
|
|
196
|
+
}
|
|
164
197
|
let lazyL2;
|
|
165
198
|
function getL2Wallet() {
|
|
166
199
|
if (l2Wallet) return l2Wallet;
|
|
@@ -185,6 +218,7 @@ function createViemClient(args) {
|
|
|
185
218
|
refresh,
|
|
186
219
|
baseToken,
|
|
187
220
|
getProtocolVersion,
|
|
221
|
+
getChainProtocolVersion,
|
|
188
222
|
getL2Wallet
|
|
189
223
|
};
|
|
190
224
|
}
|
|
@@ -28,6 +28,7 @@ __export(constants_exports, {
|
|
|
28
28
|
L1_TX_MIN_L2_GAS_BASE: () => L1_TX_MIN_L2_GAS_BASE,
|
|
29
29
|
L2_ASSET_ROUTER_ADDRESS: () => L2_ASSET_ROUTER_ADDRESS,
|
|
30
30
|
L2_BASE_TOKEN_ADDRESS: () => L2_BASE_TOKEN_ADDRESS,
|
|
31
|
+
L2_INTEROP_ATTRIBUTE_PARSER_ADDRESS: () => L2_INTEROP_ATTRIBUTE_PARSER_ADDRESS,
|
|
31
32
|
L2_INTEROP_CENTER_ADDRESS: () => L2_INTEROP_CENTER_ADDRESS,
|
|
32
33
|
L2_INTEROP_HANDLER_ADDRESS: () => L2_INTEROP_HANDLER_ADDRESS,
|
|
33
34
|
L2_INTEROP_ROOT_STORAGE_ADDRESS: () => L2_INTEROP_ROOT_STORAGE_ADDRESS,
|
|
@@ -55,6 +56,7 @@ var L2_BASE_TOKEN_ADDRESS = "0x000000000000000000000000000000000000800A";
|
|
|
55
56
|
var L2_INTEROP_CENTER_ADDRESS = "0x000000000000000000000000000000000001000d";
|
|
56
57
|
var L2_INTEROP_HANDLER_ADDRESS = "0x000000000000000000000000000000000001000e";
|
|
57
58
|
var L2_INTEROP_ROOT_STORAGE_ADDRESS = "0x0000000000000000000000000000000000010008";
|
|
59
|
+
var L2_INTEROP_ATTRIBUTE_PARSER_ADDRESS = "0x0000000000000000000000000000000000010015";
|
|
58
60
|
var L2_MESSAGE_VERIFICATION_ADDRESS = "0x0000000000000000000000000000000000010009";
|
|
59
61
|
var L1_SOPH_TOKEN_ADDRESS = "0xa9544a49d4aEa4c8E074431c89C79fA9592049d8";
|
|
60
62
|
var BUNDLE_IDENTIFIER = "0x01";
|
|
@@ -80,4 +82,4 @@ var PRIORITY_TX_MAX_GAS_LIMIT = 72000000n;
|
|
|
80
82
|
var L1_FEE_ESTIMATION_COEF_NUMERATOR = 12;
|
|
81
83
|
var L1_FEE_ESTIMATION_COEF_DENOMINATOR = 10;
|
|
82
84
|
|
|
83
|
-
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_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, __export, constants_exports, k256hex };
|
|
85
|
+
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, __export, constants_exports, k256hex };
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import { createErrorHandlers } from './chunk-
|
|
1
|
+
import { createErrorHandlers } from './chunk-CPNHKNI4.js';
|
|
2
|
+
import { unpackSemver } from './chunk-UMPAKZCQ.js';
|
|
2
3
|
import { makeTransportFromEthers } from './chunk-BWKWWLY4.js';
|
|
3
|
-
import { createError, OP_CLIENT, IBridgehub_default, IL1AssetRouter_default, IL1Nullifier_default, L2MessageVerification_default, IInteropHandler_default, IInteropCenter_default, IBaseToken_default, L2NativeTokenVault_default, IL2AssetRouter_default, L1NativeTokenVault_default, OP_DEPOSITS, createZksRpc } from './chunk-
|
|
4
|
-
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 { createError, OP_CLIENT, IBridgehub_default, IL1AssetRouter_default, IL1Nullifier_default, L2MessageVerification_default, IInteropHandler_default, IInteropCenter_default, IBaseToken_default, L2NativeTokenVault_default, IL2AssetRouter_default, L1NativeTokenVault_default, OP_DEPOSITS, createZksRpc } from './chunk-AMRHBZIY.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-NQRYXL3K.js';
|
|
5
6
|
import { BrowserProvider, Interface, Contract } from 'ethers';
|
|
6
7
|
|
|
7
8
|
// src/adapters/ethers/rpc.ts
|
|
@@ -18,7 +19,10 @@ function zksRpcFromEthers(l2Provider) {
|
|
|
18
19
|
// src/adapters/ethers/client.ts
|
|
19
20
|
var { wrapAs, wrap } = createErrorHandlers("client");
|
|
20
21
|
var ChainTypeManagerABI = [
|
|
21
|
-
"function getSemverProtocolVersion() view returns (uint32,uint32,uint32)"
|
|
22
|
+
"function getSemverProtocolVersion() view returns (uint32,uint32,uint32)",
|
|
23
|
+
// Per-chain version. `getSemverProtocolVersion` reports the CTM's own (latest) version, which
|
|
24
|
+
// runs ahead of individual chains mid-upgrade — so capability gating must use this one.
|
|
25
|
+
"function getProtocolVersion(uint256 _chainId) view returns (uint256)"
|
|
22
26
|
];
|
|
23
27
|
function createEthersClient(args) {
|
|
24
28
|
const { l1, l2, signer } = args;
|
|
@@ -177,6 +181,21 @@ function createEthersClient(args) {
|
|
|
177
181
|
);
|
|
178
182
|
return semver;
|
|
179
183
|
}
|
|
184
|
+
async function getChainProtocolVersion(chainId) {
|
|
185
|
+
try {
|
|
186
|
+
const targetChainId = chainId ?? (await l2.getNetwork()).chainId;
|
|
187
|
+
const { bridgehub } = await ensureAddresses();
|
|
188
|
+
const bh = new Contract(bridgehub, IBridgehub_default, l1);
|
|
189
|
+
const chainTypeManager = await bh.chainTypeManager(targetChainId);
|
|
190
|
+
if (chainTypeManager.toLowerCase() === FORMAL_ETH_ADDRESS) return void 0;
|
|
191
|
+
const ctm = new Contract(chainTypeManager, ChainTypeManagerABI, l1);
|
|
192
|
+
const packed = await ctm.getProtocolVersion(targetChainId);
|
|
193
|
+
if (packed === 0n) return void 0;
|
|
194
|
+
return unpackSemver(packed);
|
|
195
|
+
} catch {
|
|
196
|
+
return void 0;
|
|
197
|
+
}
|
|
198
|
+
}
|
|
180
199
|
function signerFor(target) {
|
|
181
200
|
if (target === "l1") {
|
|
182
201
|
return boundSigner.provider === l1 ? boundSigner : boundSigner.connect(l1);
|
|
@@ -201,6 +220,7 @@ function createEthersClient(args) {
|
|
|
201
220
|
refresh,
|
|
202
221
|
baseToken,
|
|
203
222
|
getProtocolVersion,
|
|
223
|
+
getChainProtocolVersion,
|
|
204
224
|
signerFor
|
|
205
225
|
};
|
|
206
226
|
return client;
|
|
@@ -0,0 +1,157 @@
|
|
|
1
|
+
import { assertNever, createError, OP_WITHDRAWALS } from './chunk-AMRHBZIY.js';
|
|
2
|
+
import { L2_INTEROP_CENTER_ADDRESS, L2_INTEROP_ATTRIBUTE_PARSER_ADDRESS, BUNDLE_IDENTIFIER } from './chunk-NQRYXL3K.js';
|
|
3
|
+
import { keccak_256 } from '@noble/hashes/sha3';
|
|
4
|
+
import { bytesToHex, hexToBytes } from '@noble/hashes/utils';
|
|
5
|
+
|
|
6
|
+
// src/core/resources/withdrawals/protocol.ts
|
|
7
|
+
var MIN_INTEROP_WITHDRAWAL_MINOR = 32;
|
|
8
|
+
function protocolFromVersion(version) {
|
|
9
|
+
const [, minor] = version;
|
|
10
|
+
return minor >= MIN_INTEROP_WITHDRAWAL_MINOR ? "interop-bundle" : "legacy-withdrawal";
|
|
11
|
+
}
|
|
12
|
+
async function detectWithdrawalProtocol(probes, override) {
|
|
13
|
+
if (override) {
|
|
14
|
+
return { protocol: override, source: { via: "override" } };
|
|
15
|
+
}
|
|
16
|
+
const version = await probes.protocolVersion();
|
|
17
|
+
if (version) {
|
|
18
|
+
return { protocol: protocolFromVersion(version), source: { via: "protocol-version", version } };
|
|
19
|
+
}
|
|
20
|
+
if (await probes.hasCodeAt(L2_INTEROP_ATTRIBUTE_PARSER_ADDRESS)) {
|
|
21
|
+
return {
|
|
22
|
+
protocol: "interop-bundle",
|
|
23
|
+
source: { via: "code-probe", address: L2_INTEROP_ATTRIBUTE_PARSER_ADDRESS }
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
return {
|
|
27
|
+
protocol: "legacy-withdrawal",
|
|
28
|
+
source: { via: "code-probe", address: L2_INTEROP_ATTRIBUTE_PARSER_ADDRESS }
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
// src/core/resources/withdrawals/status.ts
|
|
33
|
+
function phaseFromReadiness(r) {
|
|
34
|
+
switch (r.kind) {
|
|
35
|
+
case "FINALIZED":
|
|
36
|
+
return { phase: "FINALIZED" };
|
|
37
|
+
case "READY":
|
|
38
|
+
return { phase: "READY_TO_FINALIZE" };
|
|
39
|
+
case "NOT_READY":
|
|
40
|
+
return { phase: "PENDING", reason: formatReason(r.reason, r.detail) };
|
|
41
|
+
case "UNFINALIZABLE":
|
|
42
|
+
return { phase: "UNFINALIZABLE", reason: formatReason(r.reason, r.detail) };
|
|
43
|
+
default:
|
|
44
|
+
return assertNever(r);
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
var formatReason = (reason, detail) => detail ? `${reason}: ${detail}` : reason;
|
|
48
|
+
|
|
49
|
+
// src/core/resources/withdrawals/bundle.ts
|
|
50
|
+
function buildWithdrawalBundle(input) {
|
|
51
|
+
const {
|
|
52
|
+
assetId,
|
|
53
|
+
amount,
|
|
54
|
+
l1Receiver,
|
|
55
|
+
l2Token,
|
|
56
|
+
isBaseToken,
|
|
57
|
+
l1ChainId,
|
|
58
|
+
l2AssetRouter,
|
|
59
|
+
salt,
|
|
60
|
+
codec,
|
|
61
|
+
attributes,
|
|
62
|
+
transferData
|
|
63
|
+
} = input;
|
|
64
|
+
const burnData = transferData.encodeBridgeBurnData(amount, l1Receiver, l2Token);
|
|
65
|
+
const depositData = transferData.encodeAssetRouterDepositData(assetId, burnData);
|
|
66
|
+
const indirectCallMessageValue = isBaseToken ? amount : 0n;
|
|
67
|
+
const starter = [
|
|
68
|
+
codec.formatAddress(l2AssetRouter),
|
|
69
|
+
depositData,
|
|
70
|
+
[attributes.indirectCall(indirectCallMessageValue), attributes.interopCallValue(0n)]
|
|
71
|
+
];
|
|
72
|
+
return {
|
|
73
|
+
destinationChain: codec.formatChain(l1ChainId),
|
|
74
|
+
starters: [starter],
|
|
75
|
+
// No `atomicBundle` attribute: L2 -> L1 withdrawals are non-atomic and are published to L1 as a
|
|
76
|
+
// `BUNDLE_IDENTIFIER`-prefixed message, which is what the L1 handler proves inclusion of.
|
|
77
|
+
bundleAttributes: [attributes.interopBundleSalt(salt)],
|
|
78
|
+
value: indirectCallMessageValue
|
|
79
|
+
};
|
|
80
|
+
}
|
|
81
|
+
function withdrawalBundleSalt(input) {
|
|
82
|
+
return input.hash(input.sender, BigInt(input.nonce));
|
|
83
|
+
}
|
|
84
|
+
function keccakHex(data) {
|
|
85
|
+
return `0x${bytesToHex(keccak_256(hexToBytes(data.slice(2))))}`;
|
|
86
|
+
}
|
|
87
|
+
function stripBundleIdentifier(messageData) {
|
|
88
|
+
const prefix = `0x${messageData.slice(2, 4)}`;
|
|
89
|
+
if (prefix !== BUNDLE_IDENTIFIER) {
|
|
90
|
+
throw createError("STATE", {
|
|
91
|
+
resource: "withdrawals",
|
|
92
|
+
operation: OP_WITHDRAWALS.finalize.fetchParams.decodeMessage,
|
|
93
|
+
message: "L2\u2192L1 message is not an interop bundle. This withdrawal was most likely initiated before the chain upgraded to protocol v32 and cannot be finalized through the interop handler.",
|
|
94
|
+
context: { prefix, expected: BUNDLE_IDENTIFIER }
|
|
95
|
+
});
|
|
96
|
+
}
|
|
97
|
+
return `0x${messageData.slice(4)}`;
|
|
98
|
+
}
|
|
99
|
+
function parseBundleHashFromLogs(logs, interopCenter = L2_INTEROP_CENTER_ADDRESS) {
|
|
100
|
+
const center = interopCenter.toLowerCase();
|
|
101
|
+
for (const log of logs) {
|
|
102
|
+
if (log.address?.toLowerCase() !== center) continue;
|
|
103
|
+
if (log.topics?.length !== 1) continue;
|
|
104
|
+
if (!log.data || (log.data.length - 2) / 64 < 3) continue;
|
|
105
|
+
return `0x${log.data.slice(66, 130)}`;
|
|
106
|
+
}
|
|
107
|
+
return void 0;
|
|
108
|
+
}
|
|
109
|
+
function buildWithdrawalFinalization(input) {
|
|
110
|
+
const { messageData, sourceChainId, txNumberInBatch, proof } = input;
|
|
111
|
+
const bundle = stripBundleIdentifier(messageData);
|
|
112
|
+
return {
|
|
113
|
+
bundle,
|
|
114
|
+
bundleHash: input.bundleHash ?? keccakHex(bundle),
|
|
115
|
+
proof: {
|
|
116
|
+
chainId: sourceChainId,
|
|
117
|
+
l1BatchNumber: proof.batchNumber,
|
|
118
|
+
l2MessageIndex: proof.id,
|
|
119
|
+
message: {
|
|
120
|
+
txNumberInBatch,
|
|
121
|
+
sender: input.interopCenter ?? L2_INTEROP_CENTER_ADDRESS,
|
|
122
|
+
data: messageData
|
|
123
|
+
},
|
|
124
|
+
proof: proof.proof
|
|
125
|
+
}
|
|
126
|
+
};
|
|
127
|
+
}
|
|
128
|
+
var BundleStatus = /* @__PURE__ */ ((BundleStatus2) => {
|
|
129
|
+
BundleStatus2[BundleStatus2["Unreceived"] = 0] = "Unreceived";
|
|
130
|
+
BundleStatus2[BundleStatus2["Verified"] = 1] = "Verified";
|
|
131
|
+
BundleStatus2[BundleStatus2["FullyExecuted"] = 2] = "FullyExecuted";
|
|
132
|
+
BundleStatus2[BundleStatus2["Unbundled"] = 3] = "Unbundled";
|
|
133
|
+
return BundleStatus2;
|
|
134
|
+
})(BundleStatus || {});
|
|
135
|
+
var CallStatus = /* @__PURE__ */ ((CallStatus2) => {
|
|
136
|
+
CallStatus2[CallStatus2["Unprocessed"] = 0] = "Unprocessed";
|
|
137
|
+
CallStatus2[CallStatus2["Executed"] = 1] = "Executed";
|
|
138
|
+
CallStatus2[CallStatus2["Cancelled"] = 2] = "Cancelled";
|
|
139
|
+
return CallStatus2;
|
|
140
|
+
})(CallStatus || {});
|
|
141
|
+
function classifyWithdrawalOutcome(bundleStatus, callStatus) {
|
|
142
|
+
if (bundleStatus === 2 /* FullyExecuted */) return "finalized";
|
|
143
|
+
if (bundleStatus !== 3 /* Unbundled */) return "pending";
|
|
144
|
+
switch (callStatus) {
|
|
145
|
+
case 1 /* Executed */:
|
|
146
|
+
return "finalized";
|
|
147
|
+
case 2 /* Cancelled */:
|
|
148
|
+
return "failed";
|
|
149
|
+
default:
|
|
150
|
+
return "pending";
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
function isBundleFinalized(status) {
|
|
154
|
+
return status === 2 /* FullyExecuted */;
|
|
155
|
+
}
|
|
156
|
+
|
|
157
|
+
export { BundleStatus, CallStatus, MIN_INTEROP_WITHDRAWAL_MINOR, buildWithdrawalBundle, buildWithdrawalFinalization, classifyWithdrawalOutcome, detectWithdrawalProtocol, isBundleFinalized, keccakHex, parseBundleHashFromLogs, phaseFromReadiness, protocolFromVersion, stripBundleIdentifier, withdrawalBundleSalt };
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
// src/core/resources/protocol/semver.ts
|
|
2
|
+
var SEMVER_MINOR_OFFSET = 32n;
|
|
3
|
+
var SEMVER_MAJOR_OFFSET = 64n;
|
|
4
|
+
var U32_MASK = 0xffffffffn;
|
|
5
|
+
function unpackSemver(packed) {
|
|
6
|
+
const patch = Number(packed & U32_MASK);
|
|
7
|
+
const minor = Number(packed >> SEMVER_MINOR_OFFSET & U32_MASK);
|
|
8
|
+
const major = Number(packed >> SEMVER_MAJOR_OFFSET & U32_MASK);
|
|
9
|
+
return [major, minor, patch];
|
|
10
|
+
}
|
|
11
|
+
function packSemver(version) {
|
|
12
|
+
const [major, minor, patch] = version;
|
|
13
|
+
return BigInt(major) << SEMVER_MAJOR_OFFSET | BigInt(minor) << SEMVER_MINOR_OFFSET | BigInt(patch);
|
|
14
|
+
}
|
|
15
|
+
function formatProtocolVersion(version) {
|
|
16
|
+
return version.join(".");
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
export { SEMVER_MAJOR_OFFSET, SEMVER_MINOR_OFFSET, formatProtocolVersion, packSemver, unpackSemver };
|
package/dist/core/abi.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export { default as IBridgehubABI } from './internal/abis/IBridgehub';
|
|
2
2
|
export { default as IL1AssetRouterABI } from './internal/abis/IL1AssetRouter';
|
|
3
3
|
export { default as IL1NullifierABI } from './internal/abis/IL1Nullifier';
|
|
4
|
+
export { default as IL1NullifierV32ABI } from './internal/abis/IL1NullifierV32';
|
|
4
5
|
export { default as IL2AssetRouterABI } from './internal/abis/IL2AssetRouter';
|
|
5
6
|
export { default as L1NativeTokenVaultABI } from './internal/abis/L1NativeTokenVault';
|
|
6
7
|
export { default as L2NativeTokenVaultABI } from './internal/abis/L2NativeTokenVault';
|
package/dist/core/constants.cjs
CHANGED
|
@@ -14,6 +14,7 @@ var L2_BASE_TOKEN_ADDRESS = "0x000000000000000000000000000000000000800A";
|
|
|
14
14
|
var L2_INTEROP_CENTER_ADDRESS = "0x000000000000000000000000000000000001000d";
|
|
15
15
|
var L2_INTEROP_HANDLER_ADDRESS = "0x000000000000000000000000000000000001000e";
|
|
16
16
|
var L2_INTEROP_ROOT_STORAGE_ADDRESS = "0x0000000000000000000000000000000000010008";
|
|
17
|
+
var L2_INTEROP_ATTRIBUTE_PARSER_ADDRESS = "0x0000000000000000000000000000000000010015";
|
|
17
18
|
var L2_MESSAGE_VERIFICATION_ADDRESS = "0x0000000000000000000000000000000000010009";
|
|
18
19
|
var L1_SOPH_TOKEN_ADDRESS = "0xa9544a49d4aEa4c8E074431c89C79fA9592049d8";
|
|
19
20
|
var BUNDLE_IDENTIFIER = "0x01";
|
|
@@ -57,6 +58,7 @@ exports.L1_TX_INTRINSIC_PUBDATA = L1_TX_INTRINSIC_PUBDATA;
|
|
|
57
58
|
exports.L1_TX_MIN_L2_GAS_BASE = L1_TX_MIN_L2_GAS_BASE;
|
|
58
59
|
exports.L2_ASSET_ROUTER_ADDRESS = L2_ASSET_ROUTER_ADDRESS;
|
|
59
60
|
exports.L2_BASE_TOKEN_ADDRESS = L2_BASE_TOKEN_ADDRESS;
|
|
61
|
+
exports.L2_INTEROP_ATTRIBUTE_PARSER_ADDRESS = L2_INTEROP_ATTRIBUTE_PARSER_ADDRESS;
|
|
60
62
|
exports.L2_INTEROP_CENTER_ADDRESS = L2_INTEROP_CENTER_ADDRESS;
|
|
61
63
|
exports.L2_INTEROP_HANDLER_ADDRESS = L2_INTEROP_HANDLER_ADDRESS;
|
|
62
64
|
exports.L2_INTEROP_ROOT_STORAGE_ADDRESS = L2_INTEROP_ROOT_STORAGE_ADDRESS;
|
|
@@ -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;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;AAMlC,IAAM,gCAAA,GAAmC;AAMzC,IAAM,kCAAA,GAAqC","file":"constants.cjs"}
|
|
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;AAMlC,IAAM,gCAAA,GAAmC;AAMzC,IAAM,kCAAA,GAAqC","file":"constants.cjs"}
|
package/dist/core/constants.d.ts
CHANGED
|
@@ -19,6 +19,15 @@ export declare const L2_INTEROP_CENTER_ADDRESS: Address;
|
|
|
19
19
|
export declare const L2_INTEROP_HANDLER_ADDRESS: Address;
|
|
20
20
|
/** The address of the L2 InteropRootStorage contract. */
|
|
21
21
|
export declare const L2_INTEROP_ROOT_STORAGE_ADDRESS: Address;
|
|
22
|
+
/**
|
|
23
|
+
* The address of the L2 InteropAttributeParser contract.
|
|
24
|
+
*
|
|
25
|
+
* Introduced by protocol v32 and force-deployed on **every** v32 chain (both EraVM and ZKsync OS),
|
|
26
|
+
* which makes "is there code here?" a reliable probe for the v32 withdrawal protocol when the
|
|
27
|
+
* protocol version cannot be read. The atomic-interop built-ins are not usable this way: they are
|
|
28
|
+
* force-deployed on ZKsync OS only.
|
|
29
|
+
*/
|
|
30
|
+
export declare const L2_INTEROP_ATTRIBUTE_PARSER_ADDRESS: Address;
|
|
22
31
|
/** L2 Message Verification contract address. */
|
|
23
32
|
export declare const L2_MESSAGE_VERIFICATION_ADDRESS: Address;
|
|
24
33
|
/** L1 token address (SOPH). */
|
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_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_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-NQRYXL3K.js';
|