gate-evm-tools 1.2.1 → 1.2.2
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/README.md +6 -2
- package/bin/cli.js +3 -0
- package/bin/delivery.cjs +11 -6
- package/bin/migration.js +38 -0
- package/dist/commands/prepare.d.ts.map +1 -1
- package/dist/commands/prepare.js +7 -1
- package/dist/commands/prepare.js.map +1 -1
- package/dist/core/BytecodeChecker.d.ts.map +1 -1
- package/dist/core/BytecodeChecker.js +27 -4
- package/dist/core/BytecodeChecker.js.map +1 -1
- package/dist/core/preparation/artifacts.d.ts.map +1 -1
- package/dist/core/preparation/artifacts.js +12 -5
- package/dist/core/preparation/artifacts.js.map +1 -1
- package/dist/core/preparation/index.d.ts +3 -0
- package/dist/core/preparation/index.d.ts.map +1 -1
- package/dist/core/preparation/index.js +9 -2
- package/dist/core/preparation/index.js.map +1 -1
- package/dist/core/preparation/zksync.d.ts.map +1 -1
- package/dist/core/preparation/zksync.js +5 -0
- package/dist/core/preparation/zksync.js.map +1 -1
- package/dist/core/validateAndGenerateCalldata.d.ts.map +1 -1
- package/dist/core/validateAndGenerateCalldata.js +3 -0
- package/dist/core/validateAndGenerateCalldata.js.map +1 -1
- package/dist/deployment-zksync/index.d.ts +40 -0
- package/dist/deployment-zksync/index.d.ts.map +1 -0
- package/dist/deployment-zksync/index.js +59 -0
- package/dist/deployment-zksync/index.js.map +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +7 -12
- package/dist/index.js.map +1 -1
- package/dist/migration/index.d.ts +76 -0
- package/dist/migration/index.d.ts.map +1 -0
- package/dist/migration/index.js +284 -0
- package/dist/migration/index.js.map +1 -0
- package/dist/types.d.ts +1 -0
- package/dist/types.d.ts.map +1 -1
- package/dist-cjs/core/BytecodeChecker.js +27 -4
- package/dist-cjs/core/BytecodeChecker.js.map +1 -1
- package/dist-cjs/core/preparation/artifacts.js +11 -4
- package/dist-cjs/core/preparation/artifacts.js.map +1 -1
- package/dist-cjs/core/preparation/index.js +47 -6
- package/dist-cjs/core/preparation/index.js.map +1 -1
- package/dist-cjs/core/preparation/zksync.js +5 -0
- package/dist-cjs/core/preparation/zksync.js.map +1 -1
- package/dist-cjs/deployment-zksync/index.js +67 -0
- package/dist-cjs/deployment-zksync/index.js.map +1 -0
- package/dist-cjs/migration/index.js +328 -0
- package/dist-cjs/migration/index.js.map +1 -0
- package/dist-runtime/delivery/aggregate-diagnostics.js +3 -0
- package/dist-runtime/delivery/aggregate-diagnostics.js.map +1 -1
- package/dist-runtime/delivery/aggregate-inputs.d.ts +32 -6
- package/dist-runtime/delivery/aggregate-inputs.js +7 -3
- package/dist-runtime/delivery/aggregate-inputs.js.map +1 -1
- package/dist-runtime/delivery/aggregate-worker.js +3 -3
- package/dist-runtime/delivery/aggregate-worker.js.map +1 -1
- package/dist-runtime/delivery/aggregate.js +2 -2
- package/dist-runtime/delivery/aggregate.js.map +1 -1
- package/dist-runtime/delivery/cli-host.d.ts +17 -0
- package/dist-runtime/delivery/cli-host.js +118 -0
- package/dist-runtime/delivery/cli-host.js.map +1 -0
- package/dist-runtime/delivery/cli.d.ts +114 -0
- package/dist-runtime/delivery/cli.js +228 -0
- package/dist-runtime/delivery/cli.js.map +1 -0
- package/dist-runtime/delivery/compiler-dependency-pins.js +30 -1
- package/dist-runtime/delivery/compiler-dependency-pins.js.map +1 -1
- package/dist-runtime/delivery/configuration-definition.js +152 -11
- package/dist-runtime/delivery/configuration-definition.js.map +1 -1
- package/dist-runtime/delivery/configuration-hre.js +1 -1
- package/dist-runtime/delivery/configuration-hre.js.map +1 -1
- package/dist-runtime/delivery/configuration.js +7 -4
- package/dist-runtime/delivery/configuration.js.map +1 -1
- package/dist-runtime/delivery/custom-format.d.ts +2 -1
- package/dist-runtime/delivery/custom-format.js +15 -2
- package/dist-runtime/delivery/custom-format.js.map +1 -1
- package/dist-runtime/delivery/custom.d.ts +4 -0
- package/dist-runtime/delivery/custom.js +21 -0
- package/dist-runtime/delivery/custom.js.map +1 -1
- package/dist-runtime/delivery/development-inputs.d.ts +9 -0
- package/dist-runtime/delivery/development-inputs.js +41 -0
- package/dist-runtime/delivery/development-inputs.js.map +1 -1
- package/dist-runtime/delivery/development.d.ts +1 -1
- package/dist-runtime/delivery/development.js +5 -2
- package/dist-runtime/delivery/development.js.map +1 -1
- package/dist-runtime/delivery/execution-records.d.ts +16 -0
- package/dist-runtime/delivery/execution-records.js +48 -0
- package/dist-runtime/delivery/execution-records.js.map +1 -0
- package/dist-runtime/delivery/existing-code.d.ts +3 -0
- package/dist-runtime/delivery/existing-code.js +20 -0
- package/dist-runtime/delivery/existing-code.js.map +1 -1
- package/dist-runtime/delivery/input-files.d.ts +2 -0
- package/dist-runtime/delivery/input-files.js +5 -0
- package/dist-runtime/delivery/input-files.js.map +1 -1
- package/dist-runtime/delivery/inputs.js +11 -6
- package/dist-runtime/delivery/inputs.js.map +1 -1
- package/dist-runtime/delivery/materialization.js +20 -1
- package/dist-runtime/delivery/materialization.js.map +1 -1
- package/dist-runtime/delivery/planning.d.ts +1 -0
- package/dist-runtime/delivery/planning.js +10 -2
- package/dist-runtime/delivery/planning.js.map +1 -1
- package/dist-runtime/delivery/production-finalization.js +3 -2
- package/dist-runtime/delivery/production-finalization.js.map +1 -1
- package/dist-runtime/delivery/production.d.ts +2 -0
- package/dist-runtime/delivery/production.js +5 -4
- package/dist-runtime/delivery/production.js.map +1 -1
- package/dist-runtime/delivery/project-files.js +6 -1
- package/dist-runtime/delivery/project-files.js.map +1 -1
- package/dist-runtime/delivery/project-rpc.d.ts +1 -1
- package/dist-runtime/delivery/project-rpc.js +10 -4
- package/dist-runtime/delivery/project-rpc.js.map +1 -1
- package/dist-runtime/delivery/protocol.d.ts +6 -4
- package/dist-runtime/delivery/protocol.js +16 -5
- package/dist-runtime/delivery/protocol.js.map +1 -1
- package/dist-runtime/delivery/query.d.ts +21 -0
- package/dist-runtime/delivery/query.js +58 -0
- package/dist-runtime/delivery/query.js.map +1 -0
- package/dist-runtime/delivery/release-graph.d.ts +17 -0
- package/dist-runtime/delivery/release-graph.js +23 -0
- package/dist-runtime/delivery/release-graph.js.map +1 -1
- package/dist-runtime/delivery/release-history-capture.js +5 -2
- package/dist-runtime/delivery/release-history-capture.js.map +1 -1
- package/dist-runtime/delivery/release-history.js +19 -12
- package/dist-runtime/delivery/release-history.js.map +1 -1
- package/dist-runtime/delivery/release.d.ts +22 -0
- package/dist-runtime/delivery/release.js +13 -3
- package/dist-runtime/delivery/release.js.map +1 -1
- package/dist-runtime/delivery/scripts.d.ts +116 -0
- package/dist-runtime/delivery/scripts.js +289 -0
- package/dist-runtime/delivery/scripts.js.map +1 -0
- package/dist-runtime/delivery/setup.d.ts +1 -1
- package/dist-runtime/delivery/setup.js +26 -36
- package/dist-runtime/delivery/setup.js.map +1 -1
- package/dist-runtime/delivery/source.d.ts +5 -2
- package/dist-runtime/delivery/source.js +4 -3
- package/dist-runtime/delivery/source.js.map +1 -1
- package/dist-runtime/delivery/standalone-source.d.ts +40 -0
- package/dist-runtime/delivery/standalone-source.js +54 -0
- package/dist-runtime/delivery/standalone-source.js.map +1 -0
- package/dist-runtime/runtime-identity.json +2 -2
- package/dist-runtime/workflow/lib/calls.js +21 -1
- package/dist-runtime/workflow/lib/calls.js.map +1 -1
- package/docs/configuration-runtime-observation.md +4 -2
- package/docs/delivery-custom-input-closure.md +2 -0
- package/docs/delivery-development.md +2 -0
- package/docs/delivery-inputs.md +2 -0
- package/docs/delivery-release.md +3 -1
- package/docs/delivery-setup.md +25 -20
- package/docs/delivery-source.md +4 -2
- package/docs/migration.md +108 -0
- package/docs/script-execution.md +85 -0
- package/package.json +42 -19
- package/runtime/delivery/aggregate-diagnostics.ts +2 -0
- package/runtime/delivery/aggregate-inputs.ts +6 -5
- package/runtime/delivery/aggregate-worker.ts +3 -3
- package/runtime/delivery/aggregate.ts +2 -2
- package/runtime/delivery/cli-host.ts +55 -0
- package/runtime/delivery/cli.ts +124 -0
- package/runtime/delivery/compiler-dependency-pins.ts +30 -1
- package/runtime/delivery/configuration-definition.ts +80 -9
- package/runtime/delivery/configuration-hre.ts +1 -1
- package/runtime/delivery/configuration.ts +7 -5
- package/runtime/delivery/custom-format.ts +11 -3
- package/runtime/delivery/custom.ts +13 -0
- package/runtime/delivery/development-inputs.ts +31 -0
- package/runtime/delivery/development.ts +4 -3
- package/runtime/delivery/execution-records.ts +31 -0
- package/runtime/delivery/existing-code.ts +12 -1
- package/runtime/delivery/input-files.ts +5 -1
- package/runtime/delivery/inputs.ts +10 -6
- package/runtime/delivery/materialization.ts +8 -1
- package/runtime/delivery/planning.ts +10 -2
- package/runtime/delivery/production-finalization.ts +3 -2
- package/runtime/delivery/production.ts +5 -4
- package/runtime/delivery/project-files.ts +5 -1
- package/runtime/delivery/project-rpc.ts +10 -4
- package/runtime/delivery/protocol.ts +13 -5
- package/runtime/delivery/query.ts +34 -0
- package/runtime/delivery/release-graph.ts +17 -0
- package/runtime/delivery/release-history-capture.ts +2 -1
- package/runtime/delivery/release-history.ts +8 -3
- package/runtime/delivery/release.ts +7 -4
- package/runtime/delivery/scripts.ts +162 -0
- package/runtime/delivery/setup.ts +21 -31
- package/runtime/delivery/source.ts +7 -3
- package/runtime/delivery/standalone-source.ts +40 -0
- package/runtime/workflow/lib/calls.ts +19 -1
- package/dist-runtime/delivery/toolchain.d.ts +0 -3
- package/dist-runtime/delivery/toolchain.js +0 -52
- package/dist-runtime/delivery/toolchain.js.map +0 -1
- package/runtime/delivery/toolchain.ts +0 -48
package/README.md
CHANGED
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
|
|
3
3
|
🛠️ Gate 智能合约工具集 - EVM/zkSync CREATE2 与 UUPS 计划、字节码检查、升级验证、合约状态同步
|
|
4
4
|
|
|
5
|
+
旧仓库保留依赖与完整编译字节码的迁移入口、模板可选 zk 依赖、EraVM 部署及托管签名支持,见 [迁移与 zk 支持](docs/migration.md)。
|
|
6
|
+
|
|
5
7
|
## 功能特性
|
|
6
8
|
|
|
7
9
|
### 🔧 配置修复(fix)
|
|
@@ -16,7 +18,7 @@
|
|
|
16
18
|
- ✅ 支持检查单个合约、指定网络或所有合约
|
|
17
19
|
- ✅ **自动检测可升级合约(ERC1967代理),获取实现合约地址进行比对**
|
|
18
20
|
- ✅ 智能识别 Constructor 参数差异和 Immutable 变量差异
|
|
19
|
-
- ✅
|
|
21
|
+
- ✅ EVM 链上检查支持元数据归一化;EraVM 检查和迁移验收比较完整字节码
|
|
20
22
|
- ✅ 生成详细的 JSON 报告
|
|
21
23
|
- ✅ 支持增量更新报告
|
|
22
24
|
- ✅ 检测到配置错误时提供自动修复选项
|
|
@@ -237,7 +239,7 @@ export default {
|
|
|
237
239
|
|
|
238
240
|
- 真实私钥返回给原生 `networks.accounts`,部署行为保持不变。
|
|
239
241
|
- 托管凭证让原生 accounts 保持为空,并自动替换 `ethers.getSigners()`、匹配地址的 `ethers.getSigner()` 和 `ethers.provider.getSigner(0)`。
|
|
240
|
-
-
|
|
242
|
+
- 托管 signer 按 `hre.ethers.version` 适配:v5 使用项目运行时 `Signer`,v6 使用项目运行时 `AbstractSigner`。GateTool 内部的迁移比较和 zk SDK 使用自身的 ethers 6,不替换项目的 ethers 依赖。
|
|
241
243
|
- 业务部署脚本无需传入额外 signer;`ethers.getContractFactory()`、`deployContract()` 和 `upgrades.deployProxy()` 会取得托管 signer。
|
|
242
244
|
- 完整托管凭证通过 Bearer 发送,服务端拆解 Project Secret 与绑定钱包地址;凭证不会写入日志,每次签名请求都会生成独立的 `Idempotency-Key`。
|
|
243
245
|
|
|
@@ -816,6 +818,8 @@ in the deployment workflow. Unknown historical proxy builds still fail closed.
|
|
|
816
818
|
|
|
817
819
|
### 统一 full 模板使用 delivery(1.2.0)
|
|
818
820
|
|
|
821
|
+
业务 TS 脚本、参数文件/命令参数、单步选择、独立终端执行和恢复统一使用 `gate-tool delivery run`。从已安装包的 [脚本执行规范](docs/script-execution.md) 开始;App 和 CLI 复用执行核心,独立 CLI 无需 App 或 handoff。
|
|
822
|
+
|
|
819
823
|
配套生成器 `gate-evm-hardhat-foundry@2.3.0` 的新 full 项目使用
|
|
820
824
|
`gate-tool delivery setup/inspect` 接入部署设施与策略。full 保留项目自有 EVM 网络和
|
|
821
825
|
Foundry 测试配置;部署只使用 Hardhat 编译证据。setup 补齐经过验收的依赖约束,
|
package/bin/cli.js
CHANGED
|
@@ -3,6 +3,9 @@
|
|
|
3
3
|
import { prepareManifestEnvironment } from './manifest-bootstrap.js';
|
|
4
4
|
|
|
5
5
|
Promise.resolve().then(() => {
|
|
6
|
+
if (process.argv[2] === 'migration') {
|
|
7
|
+
return import('./migration.js').then(module => ({ run: () => module.runMigrationCli() }));
|
|
8
|
+
}
|
|
6
9
|
if (process.argv[2] === 'delivery') {
|
|
7
10
|
return import('./delivery.cjs').then(module => ({ run: () => module.default.runDeliveryCli(process.argv.slice(3)) }));
|
|
8
11
|
}
|
package/bin/delivery.cjs
CHANGED
|
@@ -4,8 +4,14 @@
|
|
|
4
4
|
// Keep this entry independent of old workflow/run and projectHardhat's eager HRE.
|
|
5
5
|
async function runDeliveryCli(args) {
|
|
6
6
|
try {
|
|
7
|
+
if (['run','release'].includes(args[0])) {
|
|
8
|
+
const result=await require('../dist-runtime/delivery/cli.js').runStandaloneCli(args);
|
|
9
|
+
console.log(JSON.stringify(result,null,2));
|
|
10
|
+
if(['pending','finalization-required','signing-result-unavailable'].includes(result.status))process.exitCode=2;
|
|
11
|
+
return;
|
|
12
|
+
}
|
|
7
13
|
if (args.length === 1 && ['--help', '-h'].includes(args[0])) {
|
|
8
|
-
console.log('gate-tool delivery <setup|inspect|create-task|prepare|execute|export-calldata|reconcile|verify> --options <local-options.json> [--hashes <explicit-hashes.json>]\ncreate-task reserves an independent round from a confirmed requirement revision. Production consumes an existing release. execute requires
|
|
14
|
+
console.log(require('../dist-runtime/delivery/cli.js').scriptCliHelp + '\n\n' + 'gate-tool delivery <setup|inspect|create-task|prepare|execute|export-calldata|reconcile|verify> --options <local-options.json> [--hashes <explicit-hashes.json>]\ncreate-task reserves an independent round from a confirmed requirement revision. Production consumes an existing release. Legacy --options execute requires its application host; standalone run provides its own terminal host. reconcile/verify observe an existing shared execution and never sign; missing store/execution is pending. --hashes is only for reconcile/verify.');
|
|
9
15
|
} else {
|
|
10
16
|
const command = args[0];
|
|
11
17
|
if (!['setup', 'inspect', 'create-task', 'prepare', 'execute', 'export-calldata', 'reconcile', 'verify'].includes(command)) throw new Error('Explicit supported command required; see --help');
|
|
@@ -27,12 +33,11 @@ try {
|
|
|
27
33
|
else {
|
|
28
34
|
// Observe the standard desktop store only; never discover a project/env-provided store
|
|
29
35
|
// or create a parallel execution. Custom embedded hosts use the in-process observer API.
|
|
30
|
-
const
|
|
31
|
-
|
|
32
|
-
if(!fs.existsSync(path.join(root,'execution.sqlite')))result={status:'pending',reason:'Original GateFlow desktop execution store missing'};
|
|
36
|
+
const root=path.join(require('node:os').homedir(),'.gate-tool','delivery');
|
|
37
|
+
if(!fs.existsSync(path.join(root,'execution.sqlite')))result={status:'pending',reason:'Original shared execution store missing'};
|
|
33
38
|
else {
|
|
34
39
|
const store=await require('../dist-runtime/delivery/execution-store.js').openExecutionStore({trustedRoot:root}),existing=await store.readExecution(options.executionId);
|
|
35
|
-
if(!existing)result={status:'pending',reason:'Original
|
|
40
|
+
if(!existing)result={status:'pending',reason:'Original shared execution missing'};
|
|
36
41
|
else {
|
|
37
42
|
const ready=api.inspectDeliveryProduction(options,command);if(ready.status!=='ready'||existing.planHash!==ready.plan.planHash)throw new Error('Original production plan mismatch');
|
|
38
43
|
const provider=api.productionRpc(options,command);
|
|
@@ -41,7 +46,7 @@ try {
|
|
|
41
46
|
}
|
|
42
47
|
}
|
|
43
48
|
console.log(JSON.stringify(result, null, 2));
|
|
44
|
-
if (
|
|
49
|
+
if (['pending', 'dependencies_pending', 'setup_pending'].includes(result.status)) process.exitCode = 2;
|
|
45
50
|
}
|
|
46
51
|
} catch (error) {
|
|
47
52
|
console.error(error instanceof Error ? error.message : String(error));
|
package/bin/migration.js
ADDED
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import fs from 'node:fs';
|
|
2
|
+
import path from 'node:path';
|
|
3
|
+
import { captureMigrationSnapshot, compareMigrationSnapshots, migrationFile, writeMigrationSnapshot } from '../dist/migration/index.js';
|
|
4
|
+
import { loadHardhat } from '../dist/utils/hardhat.js';
|
|
5
|
+
|
|
6
|
+
export async function runMigrationCli(args = process.argv.slice(3)) {
|
|
7
|
+
if (args.length === 1 && ['--help', '-h'].includes(args[0])) {
|
|
8
|
+
console.log('gate-tool migration snapshot --network <project-network> --output <new.json>\ngate-tool migration compare --before <original.json> --after <migrated.json>\nRun from the original Hardhat project root. Snapshot cleans and force-compiles with project-local dependencies. No dependency installation, config rewrite, signer selection or broadcasting. npm lock v1/v2/v3 required.');
|
|
9
|
+
return;
|
|
10
|
+
}
|
|
11
|
+
const command = args[0], allowed = command === 'snapshot' ? ['--network', '--output'] : command === 'compare' ? ['--before', '--after'] : [];
|
|
12
|
+
if (!allowed.length || args.length !== 5) throw new Error('Expected migration snapshot/compare; see gate-tool migration --help');
|
|
13
|
+
const options = {};
|
|
14
|
+
for (let index = 1; index < args.length; index += 2) {
|
|
15
|
+
const key = args[index], value = args[index + 1];
|
|
16
|
+
if (!allowed.includes(key) || Object.hasOwn(options, key) || !value || value.startsWith('--')) throw new Error('Invalid or duplicate migration option');
|
|
17
|
+
options[key] = value;
|
|
18
|
+
}
|
|
19
|
+
if (allowed.some(key => !Object.hasOwn(options, key))) throw new Error('Missing migration option');
|
|
20
|
+
const root = process.cwd();
|
|
21
|
+
if (command === 'snapshot') {
|
|
22
|
+
if (!/^[a-zA-Z0-9][a-zA-Z0-9_.-]*$/.test(options['--network'])) throw new Error('Invalid project network alias');
|
|
23
|
+
const file = migrationFile(root, options['--output']);
|
|
24
|
+
if (fs.existsSync(file)) throw new Error('Snapshot already exists; choose a new evidence file');
|
|
25
|
+
if (!fs.statSync(path.dirname(file)).isDirectory()) throw new Error('Snapshot parent directory must exist');
|
|
26
|
+
process.env.HARDHAT_NETWORK = options['--network'];
|
|
27
|
+
const hre = await loadHardhat(root);
|
|
28
|
+
if (path.resolve(hre.config.paths.root) !== path.resolve(root) || hre.network.name !== options['--network']) throw new Error('Loaded Hardhat project/network does not match migration selection');
|
|
29
|
+
const snapshot = await captureMigrationSnapshot(hre);
|
|
30
|
+
writeMigrationSnapshot(root, options['--output'], snapshot);
|
|
31
|
+
console.log(JSON.stringify({ status: 'captured', scheme: snapshot.scheme, contracts: Object.keys(snapshot.contracts).length, unlinked: snapshot.unlinked, output: options['--output'] }, null, 2));
|
|
32
|
+
} else {
|
|
33
|
+
const read = name => JSON.parse(fs.readFileSync(migrationFile(root, name), 'utf8'));
|
|
34
|
+
const result = compareMigrationSnapshots(read(options['--before']), read(options['--after']));
|
|
35
|
+
console.log(JSON.stringify(result, null, 2));
|
|
36
|
+
if (!result.matches) process.exitCode = 2;
|
|
37
|
+
}
|
|
38
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepare.d.ts","sourceRoot":"","sources":["../../src/commands/prepare.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAMlD,OAAO,EAEL,KAAK,sBAAsB,EAC5B,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAC;AAC9E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AA2ClD,eAAO,MAAM,cAAc,GACzB,SAAS,cAAc,EACvB,KAAK,sBAAsB,EAC3B,aAAoB,KACnB,OAAO,CAAC,yBAAyB,
|
|
1
|
+
{"version":3,"file":"prepare.d.ts","sourceRoot":"","sources":["../../src/commands/prepare.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAMlD,OAAO,EAEL,KAAK,sBAAsB,EAC5B,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAC;AAC9E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AA2ClD,eAAO,MAAM,cAAc,GACzB,SAAS,cAAc,EACvB,KAAK,sBAAsB,EAC3B,aAAoB,KACnB,OAAO,CAAC,yBAAyB,CAenC,CAAC;AAEF,eAAO,MAAM,cAAc,GACzB,SAAS,cAAc,EACvB,aAAoB,KACnB,OAAO,CAAC,yBAAyB,CAOnC,CAAC"}
|
package/dist/commands/prepare.js
CHANGED
|
@@ -49,7 +49,13 @@ export const prepareWithHre = async (options, hre, root = process.cwd()) => {
|
|
|
49
49
|
throw new Error(`preparation request network ${request.network} does not match CLI network ${options.network}`);
|
|
50
50
|
}
|
|
51
51
|
const outputPath = confinedFile(root, options.output, 'preparation plan output');
|
|
52
|
-
|
|
52
|
+
let plan;
|
|
53
|
+
if (options.baseline) {
|
|
54
|
+
const { prepareMigratedWorkflow } = await import('../migration/index.js');
|
|
55
|
+
plan = (await prepareMigratedWorkflow(hre, readRequest(options.baseline, root), request)).plan;
|
|
56
|
+
}
|
|
57
|
+
else
|
|
58
|
+
plan = await prepareWorkflow(hre, request);
|
|
53
59
|
return writePreparationPlanAtomic(outputPath, plan, root);
|
|
54
60
|
};
|
|
55
61
|
export const prepareCommand = async (options, root = process.cwd()) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepare.js","sourceRoot":"","sources":["../../src/commands/prepare.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"prepare.js","sourceRoot":"","sources":["../../src/commands/prepare.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BytecodeChecker.d.ts","sourceRoot":"","sources":["../../src/core/BytecodeChecker.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"BytecodeChecker.d.ts","sourceRoot":"","sources":["../../src/core/BytecodeChecker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { hashBytecode, hashBytecodeWithoutMetadata } from '@openzeppelin/upgrades-core';
|
|
2
|
+
import { hexlify } from 'ethers';
|
|
3
|
+
import { utils as zkUtils } from 'zksync-ethers';
|
|
2
4
|
import { matchLegacyProxyArtifact } from "./legacyProxyArtifact.js";
|
|
3
5
|
export class BytecodeChecker {
|
|
4
6
|
hre;
|
|
@@ -47,9 +49,16 @@ export class BytecodeChecker {
|
|
|
47
49
|
throw new Error(`Network ${network} not found in hardhat config`);
|
|
48
50
|
}
|
|
49
51
|
const ethers = this.hre.ethers;
|
|
50
|
-
const
|
|
51
|
-
|
|
52
|
-
|
|
52
|
+
const Provider = ethers.JsonRpcProvider ?? ethers.providers?.JsonRpcProvider;
|
|
53
|
+
if (!Provider)
|
|
54
|
+
throw new Error('Hardhat ethers provider API is unavailable');
|
|
55
|
+
const provider = new Provider(networkConfig.url);
|
|
56
|
+
try {
|
|
57
|
+
return await provider.getCode(address);
|
|
58
|
+
}
|
|
59
|
+
finally {
|
|
60
|
+
provider.destroy?.();
|
|
61
|
+
}
|
|
53
62
|
}
|
|
54
63
|
catch (error) {
|
|
55
64
|
throw new Error(`Failed to get onchain bytecode: ${error.message}`);
|
|
@@ -123,7 +132,9 @@ export class BytecodeChecker {
|
|
|
123
132
|
}
|
|
124
133
|
}
|
|
125
134
|
return {
|
|
126
|
-
|
|
135
|
+
// EraVM has one code image. Older Matter Labs artifacts may leave the
|
|
136
|
+
// EVM deployedBytecode field empty, including for deployable contracts.
|
|
137
|
+
bytecode: this.scheme === 'zksync-eravm' ? artifact.bytecode : artifact.deployedBytecode,
|
|
127
138
|
abi: artifact.abi,
|
|
128
139
|
immutableReferences
|
|
129
140
|
};
|
|
@@ -325,6 +336,18 @@ export class BytecodeChecker {
|
|
|
325
336
|
* 比较两个bytecode
|
|
326
337
|
*/
|
|
327
338
|
compareBytecode(onchainBytecode, localBytecode, _abi = null, immutableReferences = {}) {
|
|
339
|
+
if (this.scheme === 'zksync-eravm') {
|
|
340
|
+
try {
|
|
341
|
+
const actual = hexlify(zkUtils.hashBytecode(onchainBytecode));
|
|
342
|
+
const expected = hexlify(zkUtils.hashBytecode(localBytecode));
|
|
343
|
+
return { matches: actual === expected, reason: actual === expected
|
|
344
|
+
? 'EraVM 完整字节码哈希匹配(包含 metadata)'
|
|
345
|
+
: 'EraVM 完整字节码哈希不一致(包含 metadata)' };
|
|
346
|
+
}
|
|
347
|
+
catch {
|
|
348
|
+
return { matches: false, reason: '无效或为空的 EraVM 字节码' };
|
|
349
|
+
}
|
|
350
|
+
}
|
|
328
351
|
const onchainNormalized = this.normalizeBytecode(onchainBytecode);
|
|
329
352
|
let localNormalized = this.normalizeBytecode(localBytecode);
|
|
330
353
|
let libraryLinks = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BytecodeChecker.js","sourceRoot":"","sources":["../../src/core/BytecodeChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AACxF,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AA8BpE,MAAM,OAAO,eAAe;IAClB,GAAG,CAA4B;IAC/B,WAAW,CAAiB;IAC5B,MAAM,CAAoB;IAElC,YACE,GAA8B,EAC9B,WAA2B,EAC3B,MAAyB;QAEzB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED;;;;;;;;;OASG;IACK,iBAAiB,CAAC,IAAY;QACpC,iBAAiB;QACjB,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACzC,MAAM,sBAAsB,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAElE,kBAAkB;QAClB,MAAM,UAAU,GAAG,sBAAsB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAEvD,IAAI,UAAU,GAAG,CAAC,EAAE,CAAC;YACnB,kBAAkB;YAClB,MAAM,KAAK,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;YAC1D,MAAM,YAAY,GAAG,sBAAsB,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC;YAElE,OAAO;gBACL,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK;gBAC1C,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,YAAY,SAAS,CAAC,CAAC,CAAC,YAAY;aAChE,CAAC;QACJ,CAAC;QAED,gBAAgB;QAChB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;IAC7C,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,kBAAkB,CAAC,OAAe,EAAE,OAAe;QACvD,IAAI,CAAC;YACH,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAQ,CAAC;YAC/D,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,MAAM,IAAI,KAAK,CAAC,WAAW,OAAO,8BAA8B,CAAC,CAAC;YACpE,CAAC;YAED,MAAM,MAAM,GAAI,IAAI,CAAC,GAAW,CAAC,MAAM,CAAC;YACxC,MAAM,QAAQ,GAAG,IAAI,MAAM,CAAC,eAAe,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;YAC/D,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACjD,OAAO,QAAQ,CAAC;QAClB,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,mCAAmC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QACtE,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,gBAAgB,CAAC,YAAoB;QACzC,IAAI,CAAC;YACH,+BAA+B;YAC/B,IAAI,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;gBACrC,OAAO,MAAM,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC5C,CAAC;YAED,OAAO,MAAM,IAAI,CAAC,wBAAwB,CAAC,YAAY,CAAC,CAAC;QAC3D,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,iCAAiC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,qBAAqB;QACjC,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,CAAC,wBAAwB,CAAC,cAAc,CAAC,CAAC;QAC7D,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CACb,mCAAmC;gBACnC,yDAAyD,CAC1D,CAAC;QACJ,CAAC;IACH,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,wBAAwB,CAAC,YAAoB;QACzD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;QACrE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,KAAK,cAAc;gBACnD,CAAC,CAAC,sBAAsB;gBACxB,CAAC,CAAC,mBAAmB,CAAC;YACxB,IAAI,QAAQ,CAAC,OAAO,KAAK,cAAc,EAAE,CAAC;gBACxC,MAAM,IAAI,KAAK,CACb,YAAY,YAAY,mBAAmB,IAAI,CAAC,MAAM,oBAAoB,cAAc,EAAE,CAC3F,CAAC;YACJ,CAAC;QACH,CAAC;QACD,IAAI,mBAAmB,GAAwB,EAAE,CAAC;QAElD,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;QACvC,MAAM,oBAAoB,GAAG,QAAQ,CAAC,YAAY,CAAC;QACnD,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC;QAErD,IACE,OAAO,UAAU,KAAK,QAAQ;YAC9B,OAAO,oBAAoB,KAAK,QAAQ;YACxC,OAAO,YAAY,KAAK,UAAU,EAClC,CAAC;YACD,IAAI,CAAC;gBACH,MAAM,kBAAkB,GAAG,GAAG,UAAU,IAAI,oBAAoB,EAAE,CAAC;gBACnE,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;gBAClF,MAAM,kBAAkB,GAAG,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,oBAAoB,CAAC;oBAC3F,EAAE,GAAG,EAAE,gBAAgB,EAAE,mBAAmB,CAAC;gBAE/C,IACE,kBAAkB;oBAClB,OAAO,kBAAkB,KAAK,QAAQ;oBACtC,CAAC,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAClC,CAAC;oBACD,mBAAmB,GAAG,kBAAyC,CAAC;gBAClE,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,mBAAmB,GAAG,EAAE,CAAC;YAC3B,CAAC;QACH,CAAC;QAED,OAAO;YACL,QAAQ,EAAE,QAAQ,CAAC,gBAAgB;YACnC,GAAG,EAAE,QAAQ,CAAC,GAAG;YACjB,mBAAmB;SACpB,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,iBAAiB,CAAC,QAAgB;QAChC,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;QACvD,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAC1D,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACpC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC;YAAE,OAAO,IAAI,CAAC;QACrD,MAAM,cAAc,GAAG,MAAM,CAAC,QAAQ,CAAC,YAAY,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;QAC7D,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,GAAG,cAAc,CAAC;QACvD,IAAI,cAAc,KAAK,CAAC,IAAI,aAAa,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC;QAC5D,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,CAAC;QAC/C,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC;YAAE,OAAO,IAAI,CAAC;QAE/C,uEAAuE;QACvE,wEAAwE;QACxE,2EAA2E;QAC3E,4EAA4E;QAC5E,0EAA0E;QAC1E,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC;QAChD,IAAI,CAAC;YACH,IAAI,2BAA2B,CAAC,IAAI,CAAC,KAAK,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC;gBACnE,OAAO,UAAU,CAAC;YACpB,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,mEAAmE;QACrE,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;;;;OAQG;IACH,4BAA4B,CAC1B,WAAmB,EACnB,SAAiB;QAEjB,MAAM,YAAY,GAAsB,EAAE,CAAC;QAC3C,MAAM,gBAAgB,GAAG,wBAAwB,CAAC;QAClD,IAAI,KAA6B,CAAC;QAElC,IAAI,eAAe,GAAG,SAAS,CAAC;QAChC,IAAI,iBAAiB,GAAG,WAAW,CAAC;QAEpC,MAAM,YAAY,GAA6C,EAAE,CAAC;QAClE,OAAO,CAAC,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;YAC3D,YAAY,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;QACnE,CAAC;QAED,gBAAgB;QAChB,KAAK,IAAI,CAAC,GAAG,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAClD,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;YAC/C,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAEhC,MAAM,aAAa,GAAG,WAAW,CAAC,MAAM,IAAI,KAAK,GAAG,EAAE;gBACpD,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC,KAAK,EAAE,KAAK,GAAG,EAAE,CAAC;gBAC1C,CAAC,CAAC,EAAE,CAAC;YAEP,YAAY,CAAC,OAAO,CAAC;gBACnB,WAAW;gBACX,QAAQ,EAAE,KAAK;gBACf,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC,KAAK,aAAa,EAAE,CAAC,CAAC,CAAC,SAAS;aAChE,CAAC,CAAC;YAEH,eAAe,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,QAAQ,GAAG,eAAe,CAAC,SAAS,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;YACzG,IAAI,aAAa,EAAE,CAAC;gBAClB,iBAAiB,GAAG,iBAAiB,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,QAAQ,GAAG,iBAAiB,CAAC,SAAS,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;YACjH,CAAC;QACH,CAAC;QAED,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,CAAC;IAC9E,CAAC;IAED;;;;;;;;;;;;;OAaG;IACH,2BAA2B,CACzB,WAAmB,EACnB,SAAiB;QAEjB,6DAA6D;QAC7D,MAAM,cAAc,GAAG,gBAAgB,CAAC;QACxC,MAAM,UAAU,GAAG,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAClD,IAAI,CAAC,UAAU;YAAE,OAAO,IAAI,CAAC;QAE7B,mDAAmD;QACnD,IAAI,WAAW,CAAC,MAAM,GAAG,EAAE;YAAE,OAAO,IAAI,CAAC;QACzC,MAAM,WAAW,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAEjD,mCAAmC;QACnC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,KAAK,MAAM;YAAE,OAAO,IAAI,CAAC;QAE3F,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAChC,MAAM,iBAAiB,GAAG,IAAI,GAAG,QAAQ,GAAG,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QAEtE,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,KAAK,WAAW,EAAE,EAAE,CAAC;IAC3F,CAAC;IAED;;OAEG;IACK,8BAA8B,CACpC,WAAmB,EACnB,SAAiB,EACjB,mBAAwC;QAExC,IACE,CAAC,mBAAmB;YACpB,OAAO,mBAAmB,KAAK,QAAQ;YACvC,KAAK,CAAC,OAAO,CAAC,mBAAmB,CAAC;YAClC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,MAAM,KAAK,CAAC,EAC7C,CAAC;YACD,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,wCAAwC;aACjD,CAAC;QACJ,CAAC;QAED,MAAM,MAAM,GAMP,EAAE,CAAC;QAER,KAAK,MAAM,CAAC,EAAE,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE,CAAC;YACnE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC1D,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,MAAM,EAAE,sBAAsB,EAAE,SAAS;iBAC1C,CAAC;YACJ,CAAC;YAED,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAAkB,CAAC;YAExD,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;gBACvD,MAAM,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;gBACpC,IACE,CAAC,SAAS;oBACV,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC;oBAClC,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC;oBACnC,SAAS,CAAC,KAAK,GAAG,CAAC;oBACnB,SAAS,CAAC,MAAM,IAAI,CAAC,EACrB,CAAC;oBACD,OAAO;wBACL,OAAO,EAAE,KAAK;wBACd,MAAM,EAAE,sBAAsB,EAAE,IAAI,KAAK,qCAAqC;qBAC/E,CAAC;gBACJ,CAAC;gBAED,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,GAAG,CAAC,CAAC;gBACrC,MAAM,SAAS,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC;gBACvC,MAAM,MAAM,GAAG,QAAQ,GAAG,SAAS,CAAC;gBAEpC,IAAI,MAAM,GAAG,WAAW,CAAC,MAAM,IAAI,MAAM,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC;oBAC7D,OAAO;wBACL,OAAO,EAAE,KAAK;wBACd,MAAM,EAAE,sBAAsB,EAAE,IAAI,KAAK,QAAQ;qBAClD,CAAC;gBACJ,CAAC;gBAED,MAAM,YAAY,GAAG,WAAW,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;gBACzD,MAAM,UAAU,GAAG,qBAAqB,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;gBAC/D,IAAI,UAAU,KAAK,SAAS,IAAI,UAAU,KAAK,YAAY,EAAE,CAAC;oBAC5D,OAAO;wBACL,OAAO,EAAE,KAAK;wBACd,MAAM,EAAE,sBAAsB,EAAE,YAAY;qBAC7C,CAAC;gBACJ,CAAC;gBACD,qBAAqB,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;gBAE1D,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;YAC1D,CAAC;QACH,CAAC;QAED,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,wCAAwC;aACjD,CAAC;QACJ,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,IAAI,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;QAC3F,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;YACnD,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;YACnC,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YAC9B,IAAI,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC;gBACvC,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,MAAM,EAAE,6BAA6B,QAAQ,CAAC,EAAE,IAAI,QAAQ,CAAC,KAAK,OAAO,OAAO,CAAC,EAAE,IAAI,OAAO,CAAC,KAAK,GAAG;iBACxG,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,aAAa,GAAG,WAAW,CAAC;QAChC,IAAI,WAAW,GAAG,SAAS,CAAC;QAC5B,KAAK,IAAI,KAAK,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;YACxD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YAC5B,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YACzC,aAAa,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAClG,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,IAAI,GAAG,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC9F,CAAC;QAED,IAAI,aAAa,KAAK,WAAW,EAAE,CAAC;YAClC,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,yCAAyC;aAClD,CAAC;QACJ,CAAC;QAED,OAAO;YACL,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,gCAAgC,MAAM,CAAC,MAAM,KAAK;SAC3D,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,eAAe,CACb,eAAuB,EACvB,aAAqB,EACrB,OAAqB,IAAI,EACzB,sBAA2C,EAAE;QAE7C,MAAM,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;QAClE,IAAI,eAAe,GAAG,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;QAE5D,IAAI,YAAY,GAAsB,EAAE,CAAC;QACzC,IAAI,iBAAiB,GAAG,iBAAiB,CAAC;QAC1C,IAAI,eAAe,GAAG,eAAe,CAAC;QACtC,IAAI,kBAAkB,GAAkB,IAAI,CAAC;QAE7C,4CAA4C;QAC5C,MAAM,cAAc,GAAG,IAAI,CAAC,2BAA2B,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC;QAC5F,IAAI,cAAc,EAAE,CAAC;YACnB,iBAAiB,GAAG,cAAc,CAAC,OAAO,CAAC;YAC3C,eAAe,GAAG,cAAc,CAAC,KAAK,CAAC;YACvC,kBAAkB,GAAG,cAAc,CAAC,WAAW,CAAC;QAClD,CAAC;QAED,iCAAiC;QACjC,MAAM,sBAAsB,GAAG,uBAAuB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC7E,IAAI,sBAAsB,EAAE,CAAC;YAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,4BAA4B,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC;YACrF,iBAAiB,GAAG,MAAM,CAAC,OAAO,CAAC;YACnC,eAAe,GAAG,MAAM,CAAC,KAAK,CAAC;YAC/B,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;QACrC,CAAC;QAED,WAAW;QACX,MAAM,UAAU,GAAa,EAAE,CAAC;QAChC,IAAI,kBAAkB,EAAE,CAAC;YACvB,UAAU,CAAC,IAAI,CAAC,gBAAgB,kBAAkB,EAAE,CAAC,CAAC;QACxD,CAAC;QACD,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5B,UAAU,CAAC,IAAI,CAAC,UAAU,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACjF,CAAC;QACD,MAAM,WAAW,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAE7E,IAAI,iBAAiB,KAAK,eAAe,EAAE,CAAC;YAC1C,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,OAAO,WAAW,EAAE;gBAC5B,YAAY,EAAE,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS;aACjE,CAAC;QACJ,CAAC;QAED,MAAM,mBAAmB,GAAG,IAAI,CAAC,8BAA8B,CAC7D,iBAAiB,EACjB,eAAe,EACf,mBAAmB,CACpB,CAAC;QAEF,OAAO;YACL,GAAG,mBAAmB;YACtB,MAAM,EAAE,mBAAmB,CAAC,OAAO;gBACjC,CAAC,CAAC,GAAG,mBAAmB,CAAC,MAAM,GAAG,WAAW,EAAE;gBAC/C,CAAC,CAAC,mBAAmB,CAAC,MAAM;YAC9B,YAAY,EAAE,mBAAmB,CAAC,OAAO,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC;gBAClE,CAAC,CAAC,YAAY;gBACd,CAAC,CAAC,SAAS;SACd,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,aAAa,CAAC,YAInB;QACC,iBAAiB;QACjB,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAE1E,cAAc;QACd,MAAM,YAAY,GAAG,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAE/C,uBAAuB;QACvB,MAAM,SAAS,GAAG,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAEtE,yBAAyB;QACzB,MAAM,gBAAgB,GAAG,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;QAE3F,kCAAkC;QAClC,MAAM,SAAS,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,SAAS,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;QAElE,0CAA0C;QAC1C,MAAM,cAAc,GAAG,YAAY,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,gBAAgB,CAAC;QAExE,MAAM,MAAM,GAAgB;YAC1B,QAAQ,EAAE,cAAc,EAAG,QAAQ;YACnC,YAAY,EAAE,SAAS,EAAI,eAAe;YAC1C,OAAO,EAAE,YAAY,CAAC,OAAO;YAC7B,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/C,OAAO,EAAE,YAAY,CAAC,OAAO;YAC7B,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,IAAI;YACX,MAAM,EAAE,EAAE;YACV,qBAAqB,EAAE,CAAC;YACxB,mBAAmB,EAAE,CAAC;SACvB,CAAC;QAEF,IAAI,eAAmC,CAAC;QACxC,IAAI,CAAC;YACH,eAAe,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;YAC5F,MAAM,CAAC,qBAAqB,GAAG,eAAe,CAAC,MAAM,CAAC;YAEtD,uBAAuB;YACvB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;YAC5D,MAAM,CAAC,mBAAmB,GAAG,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC;YAEvD,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CACrC,eAAe,EACf,SAAS,CAAC,QAAQ,EAClB,SAAS,CAAC,GAAG,EACb,SAAS,CAAC,mBAAmB,CAC9B,CAAC;YACF,MAAM,CAAC,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;YACpC,MAAM,CAAC,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;QAEpC,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC;QAC/B,CAAC;QAED,wEAAwE;QACxE,2EAA2E;QAC3E,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,YAAY,IAAI,eAAe;eACjD,IAAI,CAAC,MAAM,KAAK,cAAc;eAC9B,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,MAAM,KAAK,IAAI,EAAE,CAAC;YACvE,MAAM,MAAM,GAAG,wBAAwB,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE,eAAe,CAAC,CAAC;YACvG,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;gBACtB,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC;gBACpB,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;gBAC9B,MAAM,CAAC,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC;YAC7C,CAAC;QACH,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,qBAAqB,CAAC,WAAmB;QAC7C,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,mCAAmC,WAAW,EAAE,CAAC,CAAC;QACpE,CAAC;QAED,MAAM,OAAO,GAAkB,EAAE,CAAC;QAClC,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAEhD,KAAK,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YAChE,MAAM,YAAY,GAAG;gBACnB,IAAI,EAAE,YAAY;gBAClB,OAAO,EAAE,OAAO;gBAChB,OAAO,EAAE,WAAW;aACrB,CAAC;YAEF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;YACtD,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACvB,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,qBAAqB,CAAC,YAAoB;QAC9C,MAAM,OAAO,GAAkB,EAAE,CAAC;QAElC,KAAK,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;YACxE,IAAI,SAAS,CAAC,YAAY,CAAC,EAAE,CAAC;gBAC5B,MAAM,YAAY,GAAG;oBACnB,IAAI,EAAE,YAAY;oBAClB,OAAO,EAAE,SAAS,CAAC,YAAY,CAAC;oBAChC,OAAO,EAAE,WAAW;iBACrB,CAAC;gBAEF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;gBACtD,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;QAED,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,YAAY,YAAY,2BAA2B,CAAC,CAAC;QACvE,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,iBAAiB;QACrB,MAAM,OAAO,GAAkB,EAAE,CAAC;QAElC,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;YACpD,IAAI,CAAC;gBACH,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;gBACjE,OAAO,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,CAAC;YAClC,CAAC;YAAC,OAAO,KAAU,EAAE,CAAC;gBACpB,OAAO,CAAC,GAAG,CAAC,uBAAuB,OAAO,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAClE,CAAC;QACH,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;OAEG;IACH,8BAA8B,CAAC,OAAsB;QACnD,MAAM,cAAc,GAAwC,EAAE,CAAC;QAE/D,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACvB,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;YAC/B,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;YAEzC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC7B,cAAc,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;YAC/B,CAAC;YAED,cAAc,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,GAAG;gBACtC,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACnD,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,qBAAqB,EAAE,MAAM,CAAC,qBAAqB;gBACnD,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;gBAC/C,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;gBAC/C,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;gBAC3C,6BAA6B,EAAE,MAAM,CAAC,6BAA6B;gBACnE,2BAA2B,EAAE,MAAM,CAAC,2BAA2B;aAChE,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,OAAO,cAAc,CAAC;IACxB,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"BytecodeChecker.js","sourceRoot":"","sources":["../../src/core/BytecodeChecker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"artifacts.d.ts","sourceRoot":"","sources":["../../../src/core/preparation/artifacts.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"artifacts.d.ts","sourceRoot":"","sources":["../../../src/core/preparation/artifacts.ts"],"names":[],"mappings":"AACA,OAAO,EAAwB,KAAK,YAAY,EAAE,MAAM,QAAQ,CAAC;AAIjE,OAAO,KAAK,EAAE,wBAAwB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE3E,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,YAAY,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACzC,sBAAsB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjD,WAAW,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjD;AAID,eAAO,MAAM,sBAAsB,GACjC,UAAU,gBAAgB,EAC1B,QAAQ,cAAc,KACrB,IAqBF,CAAC;AAEF,6EAA6E;AAC7E,eAAO,MAAM,oBAAoB,GAAI,UAAU,gBAAgB,EAAE,QAAQ,cAAc,KAAG,IAGzF,CAAC;AAEF,UAAU,gBAAgB;IACxB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;CACvD;AAMD,eAAO,MAAM,oBAAoB,GAC/B,WAAW,gBAAgB,EAC3B,cAAc,gBAAgB,KAC7B,OAAO,CAAC,MAAM,EAAE,CAyClB,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAC3B,UAAU,gBAAgB,EAC1B,QAAQ,cAAc,KACrB,wBAkBF,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import crypto from 'node:crypto';
|
|
2
|
-
import {
|
|
2
|
+
import { hexlify, isHexString } from 'ethers';
|
|
3
|
+
import { utils as zkUtils } from 'zksync-ethers';
|
|
3
4
|
import { canonicalPreparationJson } from './normalize.js';
|
|
4
5
|
const jsonSafe = (value) => JSON.parse(JSON.stringify(value));
|
|
5
6
|
export const assertArtifactIdentity = (artifact, scheme) => {
|
|
@@ -37,7 +38,7 @@ export const collectZkFactoryDeps = async (artifacts, rootArtifact) => {
|
|
|
37
38
|
if (!isHexString(bytecode) || bytecode === '0x') {
|
|
38
39
|
throw new Error('zkSync factory dependency bytecode must be non-empty hex bytes');
|
|
39
40
|
}
|
|
40
|
-
const digest =
|
|
41
|
+
const digest = hexlify(zkUtils.hashBytecode(bytecode));
|
|
41
42
|
if (bytecodeHashes.has(digest))
|
|
42
43
|
return;
|
|
43
44
|
bytecodeHashes.add(digest);
|
|
@@ -46,16 +47,22 @@ export const collectZkFactoryDeps = async (artifacts, rootArtifact) => {
|
|
|
46
47
|
const visitDependencies = async (artifact) => {
|
|
47
48
|
assertArtifactScheme(artifact, 'zksync-eravm');
|
|
48
49
|
const dependencies = artifact.factoryDeps;
|
|
49
|
-
for (const dependencyName of Object.
|
|
50
|
+
for (const [expectedHash, dependencyName] of Object.entries(dependencies)) {
|
|
50
51
|
if (typeof dependencyName !== 'string' || dependencyName.trim() === '') {
|
|
51
52
|
throw new Error('zkSync factory dependency must name an artifact');
|
|
52
53
|
}
|
|
53
54
|
const normalizedName = dependencyName.trim();
|
|
55
|
+
const dependency = await artifacts.readArtifact(normalizedName);
|
|
56
|
+
assertArtifactScheme(dependency, 'zksync-eravm');
|
|
57
|
+
if (artifactName(dependency) !== normalizedName)
|
|
58
|
+
throw new Error('zkSync factory dependency artifact identity mismatch');
|
|
59
|
+
const actualHash = hexlify(zkUtils.hashBytecode(dependency.bytecode));
|
|
60
|
+
if (actualHash.toLowerCase() !== expectedHash.toLowerCase()) {
|
|
61
|
+
throw new Error(`zkSync factory dependency hash mismatch for ${normalizedName}`);
|
|
62
|
+
}
|
|
54
63
|
if (visitedArtifacts.has(normalizedName))
|
|
55
64
|
continue;
|
|
56
65
|
visitedArtifacts.add(normalizedName);
|
|
57
|
-
const dependency = await artifacts.readArtifact(normalizedName);
|
|
58
|
-
assertArtifactScheme(dependency, 'zksync-eravm');
|
|
59
66
|
addBytecode(dependency.bytecode);
|
|
60
67
|
await visitDependencies(dependency);
|
|
61
68
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../../src/core/preparation/artifacts.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../../src/core/preparation/artifacts.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,4 +44,7 @@ export interface GateToolPreparationValidation {
|
|
|
44
44
|
}): Promise<void>;
|
|
45
45
|
}
|
|
46
46
|
export declare const prepareWorkflow: (hre: GateToolPreparationHre, rawRequest: unknown, validation?: GateToolPreparationValidation) => Promise<GateToolPreparationPlanV1>;
|
|
47
|
+
/** Internal post-compile adapter. Migration calls this only after a clean build
|
|
48
|
+
* has passed its complete original snapshot gate. No signer or broadcasting. */
|
|
49
|
+
export declare const prepareCompiledRequest: (hre: GateToolPreparationHre, request: GateToolNormalizedPreparationRequestV1, validation?: GateToolPreparationValidation) => Promise<GateToolPreparationPlanV1>;
|
|
47
50
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core/preparation/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0DAA0D,CAAC;AAC3F,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,KAAK,EAAE,uCAAuC,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core/preparation/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0DAA0D,CAAC;AAC3F,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,KAAK,EAAE,uCAAuC,EAAE,MAAM,YAAY,CAAC;AAE1E,OAAO,KAAK,EACV,yBAAyB,EACzB,sCAAsC,EACvC,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1B,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACxE;AAED,kGAAkG;AAClG,MAAM,WAAW,6BAA6B;IAC5C,IAAI,CAAC,KAAK,EAAC,OAAO,GAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAC,MAAM,EAAE,QAAQ,EAAC,gBAAgB,GAAE,gBAAgB,CAAC;IAClE,SAAS,CAAC,QAAQ,EAAC,gBAAgB,EAAE,MAAM,EAAC,MAAM,GAAC,IAAI,EAAE,IAAI,EAAC,OAAO,EAAE,GAAE,IAAI,CAAC;IAC9E,qGAAqG;IACrG,gBAAgB,CAAC,CAAC,KAAK,EAAE;QAAC,OAAO,EAAE,uCAAuC,CAAC;QAAC,qBAAqB,EAAC,MAAM,CAAC;QAAC,OAAO,EAAC,MAAM,CAAA;KAAC,GAAG,OAAO,CAAC;QAClI,IAAI,EAAC,WAAW,CAAC;QAAC,SAAS,EAAC,aAAa,CAAC;QAAC,MAAM,EAAC,MAAM,CAAC;KAC1D,GAAG,SAAS,CAAC,CAAC;IACf,gGAAgG;IAChG,UAAU,CAAC,CAAC,KAAK,EAAE;QACjB,QAAQ,EAAE,gBAAgB,CAAC;QAC3B,OAAO,EAAE,eAAe,CAAC;QACzB,IAAI,EAAE,UAAU,CAAC;QACjB,OAAO,EAAE,sCAAsC,CAAC;QAChD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACjC,QAAQ,CAAC,EAAE,CAAC;YAAE,KAAK,EAAE,4BAA4B,CAAA;SAAE,GAAG;YAAE,QAAQ,EAAE,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,6BAA6B,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;SAAE,CAAC,GAAG;YAAE,qBAAqB,EAAE,MAAM,CAAC;YAAC,OAAO,EAAE,MAAM,CAAA;SAAE,CAAC;KAC5N,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACnB;AACD,eAAO,MAAM,eAAe,GAC1B,KAAK,sBAAsB,EAC3B,YAAY,OAAO,EACnB,aAAa,6BAA6B,KACzC,OAAO,CAAC,yBAAyB,CASnC,CAAC;AAEF;gFACgF;AAChF,eAAO,MAAM,sBAAsB,GACjC,KAAK,sBAAsB,EAC3B,SAAS,sCAAsC,EAC/C,aAAa,6BAA6B,KACzC,OAAO,CAAC,yBAAyB,CAQnC,CAAC"}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
import { prepareEvm } from './evm.js';
|
|
2
|
-
import { prepareZkSync } from './zksync.js';
|
|
3
1
|
import { normalizePreparationRequest } from './normalize.js';
|
|
4
2
|
export const prepareWorkflow = async (hre, rawRequest, validation) => {
|
|
5
3
|
const request = normalizePreparationRequest(validation ? validation.data(rawRequest) : rawRequest);
|
|
@@ -7,9 +5,18 @@ export const prepareWorkflow = async (hre, rawRequest, validation) => {
|
|
|
7
5
|
throw new Error(`preparation request network ${request.network} does not match Hardhat network ${hre.network.name}`);
|
|
8
6
|
}
|
|
9
7
|
await hre.run('compile', { quiet: true });
|
|
8
|
+
return prepareCompiledRequest(hre, request, validation);
|
|
9
|
+
};
|
|
10
|
+
/** Internal post-compile adapter. Migration calls this only after a clean build
|
|
11
|
+
* has passed its complete original snapshot gate. No signer or broadcasting. */
|
|
12
|
+
export const prepareCompiledRequest = async (hre, request, validation) => {
|
|
13
|
+
if (hre.network.name !== request.network)
|
|
14
|
+
throw new Error('Preparation network mismatch');
|
|
10
15
|
if (request.scheme === 'evm') {
|
|
16
|
+
const { prepareEvm } = await import('./evm.js');
|
|
11
17
|
return prepareEvm(hre, request, { validation });
|
|
12
18
|
}
|
|
19
|
+
const { prepareZkSync } = await import('./zksync.js');
|
|
13
20
|
return prepareZkSync(hre, request);
|
|
14
21
|
};
|
|
15
22
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/preparation/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/preparation/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,2BAA2B,EAAE,MAAM,gBAAgB,CAAC;AA8B7D,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAClC,GAA2B,EAC3B,UAAmB,EACnB,UAA0C,EACN,EAAE;IACtC,MAAM,OAAO,GAA2C,2BAA2B,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;IAC3I,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC;QACzC,MAAM,IAAI,KAAK,CACb,+BAA+B,OAAO,CAAC,OAAO,mCAAmC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CACpG,CAAC;IACJ,CAAC;IACD,MAAM,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1C,OAAO,sBAAsB,CAAC,GAAG,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;AAC1D,CAAC,CAAC;AAEF;gFACgF;AAChF,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,EACzC,GAA2B,EAC3B,OAA+C,EAC/C,UAA0C,EACN,EAAE;IACtC,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAC1F,IAAI,OAAO,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;QAC7B,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;QAChD,OAAO,UAAU,CAAC,GAAkD,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;IACjG,CAAC;IACD,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC;IACtD,OAAO,aAAa,CAAC,GAAqD,EAAE,OAAO,CAAC,CAAC;AACvF,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zksync.d.ts","sourceRoot":"","sources":["../../../src/core/preparation/zksync.ts"],"names":[],"mappings":"AASA,OAAO,EAIL,KAAK,gBAAgB,EACtB,MAAM,gBAAgB,CAAC;AAKxB,OAAO,KAAK,EAGV,sCAAsC,EAItC,yBAAyB,EAE1B,MAAM,YAAY,CAAC;AACpB,OAAO,EAGL,KAAK,wBAAwB,EAC7B,KAAK,eAAe,EACrB,MAAM,0BAA0B,CAAC;AAiBlC,UAAU,gBAAiB,SAAQ,eAAe;IAChD,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,GAAG;QACpC,MAAM,CAAC,EAAE;YAAE,MAAM,CAAC,EAAE,OAAO,CAAC;YAAC,OAAO,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;KACjD,CAAC;IACF,SAAS,EAAE;QAAE,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;KAAE,CAAC;IACrE,MAAM,EAAE;QACN,QAAQ,EAAE;YACR,UAAU,IAAI,OAAO,CAAC;gBAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAA;aAAE,CAAC,CAAC;YAC7D,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;SAC3C,CAAC;KACH,CAAC;CACH;AAED,MAAM,WAAW,yBAAyB;IACxC,UAAU,CAAC,EAAE,wBAAwB,CAAC;CACvC;AAySD,eAAO,MAAM,aAAa,GACxB,KAAK,gBAAgB,EACrB,SAAS,sCAAsC,EAC/C,eAAc,yBAA8B,KAC3C,OAAO,CAAC,yBAAyB,
|
|
1
|
+
{"version":3,"file":"zksync.d.ts","sourceRoot":"","sources":["../../../src/core/preparation/zksync.ts"],"names":[],"mappings":"AASA,OAAO,EAIL,KAAK,gBAAgB,EACtB,MAAM,gBAAgB,CAAC;AAKxB,OAAO,KAAK,EAGV,sCAAsC,EAItC,yBAAyB,EAE1B,MAAM,YAAY,CAAC;AACpB,OAAO,EAGL,KAAK,wBAAwB,EAC7B,KAAK,eAAe,EACrB,MAAM,0BAA0B,CAAC;AAiBlC,UAAU,gBAAiB,SAAQ,eAAe;IAChD,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,GAAG;QACpC,MAAM,CAAC,EAAE;YAAE,MAAM,CAAC,EAAE,OAAO,CAAC;YAAC,OAAO,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;KACjD,CAAC;IACF,SAAS,EAAE;QAAE,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;KAAE,CAAC;IACrE,MAAM,EAAE;QACN,QAAQ,EAAE;YACR,UAAU,IAAI,OAAO,CAAC;gBAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAA;aAAE,CAAC,CAAC;YAC7D,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;SAC3C,CAAC;KACH,CAAC;CACH;AAED,MAAM,WAAW,yBAAyB;IACxC,UAAU,CAAC,EAAE,wBAAwB,CAAC;CACvC;AAySD,eAAO,MAAM,aAAa,GACxB,KAAK,gBAAgB,EACrB,SAAS,sCAAsC,EAC/C,eAAc,yBAA8B,KAC3C,OAAO,CAAC,yBAAyB,CAkBnC,CAAC"}
|
|
@@ -249,6 +249,11 @@ export const prepareZkSync = async (hre, request, dependencies = {}) => {
|
|
|
249
249
|
if (hre.network.config?.zksync !== true) {
|
|
250
250
|
throw new Error(`Hardhat network ${hre.network.name} is not configured for zkSync`);
|
|
251
251
|
}
|
|
252
|
+
if (hre.network.name !== request.network)
|
|
253
|
+
throw new Error('zkSync request network does not match the selected Hardhat network');
|
|
254
|
+
const actualChain = BigInt((await hre.ethers.provider.getNetwork()).chainId);
|
|
255
|
+
if (hre.network.config.chainId !== undefined && actualChain !== BigInt(hre.network.config.chainId))
|
|
256
|
+
throw new Error('zkSync provider chain ID does not match Hardhat configuration');
|
|
252
257
|
const artifact = await hre.artifacts.readArtifact(request.contract);
|
|
253
258
|
assertArtifactScheme(artifact, 'zksync-eravm');
|
|
254
259
|
if (request.kind === 'create2-deploy')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zksync.js","sourceRoot":"","sources":["../../../src/core/preparation/zksync.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"zksync.js","sourceRoot":"","sources":["../../../src/core/preparation/zksync.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateAndGenerateCalldata.d.ts","sourceRoot":"","sources":["../../src/core/validateAndGenerateCalldata.ts"],"names":[],"mappings":"AAcA,MAAM,WAAW,eAAe;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,GAAG,EAAE,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,EAAE,GAAG,CAAC;CACV;AA+ED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,2BAA2B,CAAC,OAAO,EAAE,eAAe;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"validateAndGenerateCalldata.d.ts","sourceRoot":"","sources":["../../src/core/validateAndGenerateCalldata.ts"],"names":[],"mappings":"AAcA,MAAM,WAAW,eAAe;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,GAAG,EAAE,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,EAAE,GAAG,CAAC;CACV;AA+ED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,2BAA2B,CAAC,OAAO,EAAE,eAAe;;;;;;;;;;;;;;;GAmDzE"}
|
|
@@ -73,6 +73,9 @@ async function registerProxyForValidation(options) {
|
|
|
73
73
|
* @param options - 验证选项
|
|
74
74
|
*/
|
|
75
75
|
export async function validateAndGenerateCalldata(options) {
|
|
76
|
+
if (options.hre.network?.config?.zksync === true) {
|
|
77
|
+
throw new Error('EraVM upgrade validation uses gate-tool prepare with scheme zksync-eravm and the selected target manifest; the EVM validate/deployment path cannot run on zkSync');
|
|
78
|
+
}
|
|
76
79
|
const { proxyAddress, oldContractName, newContractName, outputPath, constructorArgs, unsafeAllow, factoryAddress, factorySalt, hre } = options;
|
|
77
80
|
const CONTRACT_ADDRESS = proxyAddress; // 可能是代理或实现合约地址
|
|
78
81
|
const OLD_CONTRACT_NAME = oldContractName;
|