gate-evm-tools 1.0.22 → 1.0.24

package/README.md

@@ -1,6 +1,6 @@
 # Gate Smart Contract Tools
 
-🛠️ Gate 智能合约工具集 - 字节码检查、合约升级验证、合约状态同步
+🛠️ Gate 智能合约工具集 - EVM/zkSync CREATE2 与 UUPS 计划、字节码检查、升级验证、合约状态同步
 
 ## 功能特性
 
@@ -25,8 +25,15 @@
 - ✅ 同步链上合约状态到本地 .openzeppelin 文件
 - ✅ 自动读取链上实现合约地址
 - ✅ 获取并更新存储布局信息
+- ✅ EVM 与 zkSync 按 target 配置路由 manifest，并以事务方式写入或完整回滚
 
-### ✅ 升级验证（validate）
+### 🧭 规范化部署准备（prepare）
+- ✅ 普通 CREATE2、UUPS 初始部署和 UUPS 升级共用一个 version 1 plan contract
+- ✅ EVM 缺省兼容；zkSync 使用 zksolc artifact、EraVM bytecode hash、ContractDeployer calldata 与 `factoryDeps`
+- ✅ OpenZeppelin / Matter Labs 实现安全性和存储布局校验发生在任何签名或广播之前
+- ✅ prepare-only：不签名、不广播、不写 manifest
+
+### ✅ 兼容升级验证（validate，legacy）
 - ✅ **自动检测合约类型（代理合约 or 实现合约）**
 - ✅ **代理模式：验证升级安全性并生成 upgradeCalldata**
 - ✅ **实现模式：验证存储布局兼容性并部署新合约**
@@ -37,6 +44,33 @@
 - ✅ 支持同一合约和不同合约的升级模式
 - ✅ 支持带构造函数参数的合约
 
+## EVM/zkSync 统一工作流边界
+
+`gate-evm-tools/workflow` 是生成工作流唯一的部署准备实现：
+
+- GateTool 读取严格 artifact，执行 OpenZeppelin 校验，计算 CREATE2 地址，并生成 Factory、`upgradeToAndCall` calldata 与 zkSync `factoryDeps`。
+- full-template runtime 负责权限、controlled Multicall、immutable execution plan、签名、广播与 receipt reconciliation。
+- SmartFlow 校验 immutable plan、receipt 和 finalized UUPS 的 `gateToolSync` 证据，不重新计算 CREATE2 或 calldata。
+
+生成工作流应在当前 Hardhat HRE 内调用：
+
+```typescript
+import { prepareWorkflow } from "gate-evm-tools/workflow";
+
+const plan = await prepareWorkflow(hre, request);
+```
+
+人工文件入口使用同一实现：
+
+```bash
+npx gate-tool prepare \
+  --network <hardhat-network> \
+  --request scripts/tasks/<task-id>/gate-tool-request.json \
+  --output scripts/tasks/<task-id>/gate-tool-plan.json
+```
+
+request 的 `kind` 只能是 `create2-deploy`、`uups-placeholder-deploy` 或 `uups-upgrade`；`scheme` 缺省为 `evm`，也可显式设置为 `zksync-eravm`。EVM plan 不携带 `factoryDeps`；每笔 zkSync transaction 都必须显式携带锁定的 `factoryDeps`，非 bytecode-publishing 交易使用空数组。
+
 ### 📋 Calldata 解析（parse）
 - ✅ 解析 EVM calldata，显示函数名称和参数
 - ✅ 支持从 Hardhat artifacts 自动查找 ABI
@@ -163,6 +197,53 @@ module.exports = {
 };
 ```
 
+#### 托管钱包 Signer（ethers v5 / v6）
+
+`gate-evm-tools` 支持把真实私钥和托管钱包统一放在同一个配置项中：
+
+```text
+# 真实私钥
+PRIVATE_KEY=0x...
+
+# 或托管钱包凭证
+PRIVATE_KEY=custody:<ProjectSecret>:<WalletAddress>
+CUSTODY_API_BASE_URL=https://custody.example.com
+```
+
+`CUSTODY_API_BASE_URL` must be an HTTP(S) base URL without embedded
+credentials, query parameters, or fragments.
+
+也可以用 `WALLET_CREDENTIAL` 代替 `PRIVATE_KEY`。如果两个变量同时存在，值必须一致，否则会拒绝启动，避免误用账户。
+
+Hardhat 配置需要在 ethers 和 OpenZeppelin 插件之后加载托管插件，并用 `resolveHardhatAccounts` 处理网络账户：
+
+```typescript
+import "@nomicfoundation/hardhat-ethers";
+import "@openzeppelin/hardhat-upgrades";
+import "gate-evm-tools/hardhat";
+import { resolveHardhatAccounts } from "gate-evm-tools/hardhat";
+
+const walletCredential =
+  process.env.WALLET_CREDENTIAL ?? process.env.PRIVATE_KEY ?? "";
+
+export default {
+  networks: {
+    sepolia: {
+      url: process.env.SEPOLIA_RPC_URL,
+      accounts: resolveHardhatAccounts(walletCredential),
+    },
+  },
+};
+```
+
+- 真实私钥返回给原生 `networks.accounts`，部署行为保持不变。
+- 托管凭证让原生 accounts 保持为空，并自动替换 `ethers.getSigners()`、匹配地址的 `ethers.getSigner()` 和 `ethers.provider.getSigner(0)`。
+- 实际 ethers 主版本取自 `hre.ethers.version`；v5 使用运行时 `Signer`，v6 使用运行时 `AbstractSigner`，包内不会固定加载某个 ethers 版本。
+- 业务部署脚本无需传入额外 signer；`ethers.getContractFactory()`、`deployContract()` 和 `upgrades.deployProxy()` 会取得托管 signer。
+- 完整托管凭证通过 Bearer 发送，服务端拆解 Project Secret 与绑定钱包地址；凭证不会写入日志，每次签名请求都会生成独立的 `Idempotency-Key`。
+
+托管服务只返回签名或 raw transaction，不负责广播。交易最终仍由当前 Hardhat ethers Provider 广播。现有 OpenZeppelin CREATE2/Multicall 补丁与 signer 注入是两套独立能力，升级项目应继续保留原补丁。
+
 ### 4. 编译合约
 
 ```bash
@@ -228,7 +309,7 @@ npx gate-tool check --output ./reports/result.json
 
 当合约通过 calldata 方式由其他人（如多签钱包）执行升级后，本地的 `.openzeppelin` 文件不会自动更新。使用此命令可以从链上读取最新状态并更新本地文件。
 
-`sync` 和 `validate` 会在加载 OpenZeppelin upgrades 之前确定 manifest 目录。约定路由如下：
+`sync` 和 legacy `validate` 会在加载 OpenZeppelin upgrades 之前确定 manifest 目录。canonical workflow 的 `sync --target` 只接受所选 target 的 `config.yaml.openzeppelin.manifestDir`，不使用 Matter Labs 固定 `.upgradable` 目录。约定路由如下：
 
 | 网络名 | Manifest 目录 | 含义 |
 |------|------|------|
@@ -254,13 +335,26 @@ npx gate-tool sync --proxy 0x1234... --contract CounterUUPS --network sepolia
 最新 full 模版项目优先使用 `workflow:checkcode` 做只读验收，由模版负责选择精确的 manifest 文件并调用 gate-tool。
 
 ```bash
-# 同步合约状态
+# EVM：confirmed UUPS receipt 后同步合约状态
 npx gate-tool sync \
+  --scheme evm \
   --proxy 0x1234... \
   --contract CounterUUPS \
-  --network sepolia
+  --network sepolia \
+  --target sepolia
+
+# zkSync：必须同时绑定 confirmed transaction hash
+npx gate-tool sync \
+  --scheme zksync-eravm \
+  --proxy 0x1234... \
+  --contract CounterUUPS \
+  --network zkDev \
+  --target zkDev \
+  --transaction-hash 0x...
 ```
 
+`sync` 会验证 runtime code、ERC-1967 implementation slot、chain ID、UUPS kind 与当前 artifact/layout。只有 `status=committed` 的 manifest transaction 才能作为 finalized UUPS 证据；失败会恢复原文件名和原始字节。
+
 #### ✅ 验证升级安全性并生成 calldata
 
 验证合约升级的安全性，并生成 `upgradeToAndCall` 的 calldata。
@@ -524,6 +618,18 @@ npx gate-tool parse \
 | `--proxy <address>` | - | 代理合约地址 | ✅ |
 | `--contract <name>` | - | 合约名称 | ✅ |
 | `--network <name>` | `-n` | 网络名称 | - |
+| `--scheme <scheme>` | - | `evm`（默认）或 `zksync-eravm` | - |
+| `--target <name>` | - | `config.yaml` 中的部署策略与 manifest target；zkSync 必需 | zkSync ✅ |
+| `--constructor-args <json>` | - | 当前实现合约构造参数 JSON 数组 | - |
+| `--transaction-hash <hash>` | - | 已确认的部署或升级交易哈希 | zkSync ✅ |
+
+#### prepare 命令
+
+| 选项 | 简写 | 说明 | 必需 |
+|------|------|------|------|
+| `--network <name>` | `-n` | Hardhat 网络；必须与 request.network 一致 | ✅ |
+| `--request <path>` | - | 项目根目录内的严格 request JSON 文件 | ✅ |
+| `--output <path>` | `-o` | 项目根目录内的 canonical plan JSON 文件 | ✅ |
 
 #### validate 命令
 

package/bin/manifest-bootstrap.js

@@ -1,5 +1,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
+import { createRequire } from 'node:module';
 
 const MANIFEST_MUTATING_COMMANDS = new Set(['sync', 'validate']);
 const SAFE_MANIFEST_DIR = /^\.openzeppelin(?:\.[a-z0-9][a-z0-9-]*)?$/;
@@ -26,6 +27,91 @@ const isLocalDevelopmentNetwork = (network) => (
   /^(hardhat|localhost|local|anvil)$/i.test(network || '')
 );
 
+const assertConfinedRegularFile = (cwd, requestedPath, label) => {
+  if (!requestedPath || typeof requestedPath !== 'string') {
+    throw new Error(`${label} is required`);
+  }
+  const projectRoot = path.resolve(cwd);
+  const candidate = path.resolve(projectRoot, requestedPath);
+  const relative = path.relative(projectRoot, candidate);
+  if (relative === '' || relative.startsWith('..') || path.isAbsolute(relative)) {
+    throw new Error(`${label} must be a file inside the project root`);
+  }
+  let current = projectRoot;
+  for (const segment of relative.split(path.sep).filter(Boolean)) {
+    current = path.join(current, segment);
+    if (fs.existsSync(current) && fs.lstatSync(current).isSymbolicLink()) {
+      throw new Error(`${label} path cannot contain a symlink`);
+    }
+  }
+  if (!fs.existsSync(candidate) || !fs.lstatSync(candidate).isFile()) {
+    throw new Error(`${label} must be an existing regular file`);
+  }
+  return candidate;
+};
+
+const readPrepareRoute = (argv, cwd, cliNetwork) => {
+  const requestFile = assertConfinedRegularFile(
+    cwd,
+    argumentValue(argv, '--request'),
+    'prepare request',
+  );
+  let request;
+  try {
+    request = JSON.parse(fs.readFileSync(requestFile, 'utf8'));
+  } catch (error) {
+    throw new Error(`prepare request is not valid JSON: ${error.message}`);
+  }
+  if (!request || typeof request !== 'object' || Array.isArray(request)) {
+    throw new Error('prepare request must be an object');
+  }
+  const requestNetwork = typeof request.network === 'string' ? request.network.trim() : '';
+  const target = typeof request.target === 'string' ? request.target.trim() : '';
+  if (!requestNetwork || !target) {
+    throw new Error('prepare request must contain network and target');
+  }
+  if (requestNetwork !== cliNetwork) {
+    throw new Error(
+      `prepare request network ${requestNetwork} does not match CLI network ${cliNetwork || '<missing>'}`,
+    );
+  }
+  return { target };
+};
+
+const loadTargetManifestDirectory = (cwd, target) => {
+  const configFile = path.join(path.resolve(cwd), 'config.yaml');
+  const confinedConfig = assertConfinedRegularFile(cwd, configFile, 'config.yaml');
+  let YAML;
+  try {
+    YAML = createRequire(path.join(path.resolve(cwd), 'package.json'))('yaml');
+  } catch {
+    YAML = createRequire(import.meta.url)('yaml');
+  }
+  const parsed = YAML.parse(fs.readFileSync(confinedConfig, 'utf8'), { merge: true });
+  if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+    throw new Error('config.yaml must define target keys at the top level');
+  }
+  const selected = parsed[target];
+  if (!selected || typeof selected !== 'object' || Array.isArray(selected) || target.startsWith('_')) {
+    throw new Error(`config.yaml has no target ${target}`);
+  }
+  const environment = selected.environment;
+  if (!new Set(['local', 'development', 'production']).has(environment)) {
+    throw new Error(`config.yaml target ${target} has an invalid environment`);
+  }
+  const manifestDir = selected.openzeppelin?.manifestDir;
+  if (typeof manifestDir !== 'string' || !SAFE_MANIFEST_DIR.test(manifestDir)) {
+    throw new Error(`config.yaml target ${target} has an unsafe OpenZeppelin manifest directory`);
+  }
+  if (environment === 'production' && manifestDir !== '.openzeppelin') {
+    throw new Error(`production target ${target} must use .openzeppelin`);
+  }
+  if (environment !== 'production' && manifestDir === '.openzeppelin') {
+    throw new Error(`non-production target ${target} must not use .openzeppelin`);
+  }
+  return manifestDir;
+};
+
 const assertConfinedManifestDirectory = (cwd, manifestDir) => {
   if (!SAFE_MANIFEST_DIR.test(manifestDir)) {
     throw new Error(`Unsafe MANIFEST_DEFAULT_DIR: ${manifestDir}`);
@@ -55,6 +141,16 @@ export const resolveManifestBootstrap = ({
   const network = (
     argumentValue(argv, '--network') ?? argumentValue(argv, '-n')
   )?.trim();
+  const prepareRoute = command === 'prepare'
+    ? readPrepareRoute(argv, cwd, network)
+    : undefined;
+  const explicitTarget = argumentValue(argv, '--target')?.trim();
+  if (prepareRoute && explicitTarget && explicitTarget !== prepareRoute.target) {
+    throw new Error(
+      `prepare target ${prepareRoute.target} does not match CLI target ${explicitTarget}`,
+    );
+  }
+  const target = prepareRoute?.target ?? explicitTarget;
   const mutatesManifest = MANIFEST_MUTATING_COMMANDS.has(command);
   if (mutatesManifest && isLocalDevelopmentNetwork(network)) {
     throw new Error(
@@ -62,11 +158,14 @@ export const resolveManifestBootstrap = ({
       + 'OpenZeppelin stores ephemeral development manifests outside the project',
     );
   }
-  const conventional = conventionalManifestDir(network);
+  const routeName = target ?? network;
+  const conventional = target
+    ? loadTargetManifestDirectory(cwd, target)
+    : conventionalManifestDir(routeName);
   const configured = env.MANIFEST_DEFAULT_DIR?.trim();
   if (configured && conventional && configured !== conventional) {
     throw new Error(
-      `MANIFEST_DEFAULT_DIR conflict for ${network}: expected ${conventional}, received ${configured}`,
+      `MANIFEST_DEFAULT_DIR conflict for ${routeName}: expected ${conventional}, received ${configured}`,
     );
   }
   const manifestDir = configured || conventional;
@@ -77,12 +176,19 @@ export const resolveManifestBootstrap = ({
     );
   }
   if (manifestDir) assertConfinedManifestDirectory(cwd, manifestDir);
-  return { command, network, manifestDir, mutatesManifest };
+  return {
+    command,
+    network,
+    ...(target ? { target } : {}),
+    manifestDir,
+    mutatesManifest,
+  };
 };
 
 export const prepareManifestEnvironment = (options = {}) => {
   const env = options.env ?? process.env;
   const resolved = resolveManifestBootstrap({ ...options, env });
   if (resolved.manifestDir) env.MANIFEST_DEFAULT_DIR = resolved.manifestDir;
+  if (resolved.target) env.GATE_WORKFLOW_TARGET = resolved.target;
   return resolved;
 };

package/dist/commands/prepare.d.ts

@@ -0,0 +1,8 @@
+import { createRequire } from 'node:module';
+import { type GateToolPreparationHre } from '../core/preparation/index.js';
+import type { GateToolPreparationPlanV1 } from '../core/preparation/types.js';
+import type { PrepareOptions } from '../types.js';
+export declare const prepareWithHre: (options: PrepareOptions, hre: GateToolPreparationHre, root?: string) => Promise<GateToolPreparationPlanV1>;
+export declare const loadHardhat: (root: string, requireFactory?: typeof createRequire) => Promise<GateToolPreparationHre>;
+export declare const prepareCommand: (options: PrepareOptions, root?: string) => Promise<GateToolPreparationPlanV1>;
+//# sourceMappingURL=prepare.d.ts.map

package/dist/commands/prepare.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"prepare.d.ts","sourceRoot":"","sources":["../../src/commands/prepare.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAM5C,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,CAWnC,CAAC;AAEF,eAAO,MAAM,WAAW,GACtB,MAAM,MAAM,EACZ,iBAAgB,OAAO,aAA6B,KACnD,OAAO,CAAC,sBAAsB,CAahC,CAAC;AAEF,eAAO,MAAM,cAAc,GACzB,SAAS,cAAc,EACvB,aAAoB,KACnB,OAAO,CAAC,yBAAyB,CAOnC,CAAC"}

package/dist/commands/prepare.js

@@ -0,0 +1,78 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { createRequire } from 'node:module';
+import { normalizePreparationRequest, writePreparationPlanAtomic, } from '../core/preparation/normalize.js';
+import { prepareWorkflow, } from '../core/preparation/index.js';
+import { isValidNetworkName } from '../utils/security.js';
+const confinedFile = (root, requestedPath, label) => {
+    const resolvedRoot = path.resolve(root);
+    const resolvedPath = path.resolve(resolvedRoot, requestedPath);
+    const relative = path.relative(resolvedRoot, resolvedPath);
+    if (relative === '' || relative.startsWith('..') || path.isAbsolute(relative)) {
+        throw new Error(`${label} must be a file inside the project root`);
+    }
+    let current = resolvedRoot;
+    for (const segment of relative.split(path.sep).filter(Boolean)) {
+        current = path.join(current, segment);
+        if (fs.existsSync(current) && fs.lstatSync(current).isSymbolicLink()) {
+            throw new Error(`${label} path cannot contain a symlink`);
+        }
+    }
+    return resolvedPath;
+};
+const readRequest = (requestPath, root) => {
+    const confined = confinedFile(root, requestPath, 'preparation request');
+    let stat;
+    try {
+        stat = fs.lstatSync(confined);
+    }
+    catch {
+        throw new Error(`preparation request does not exist: ${requestPath}`);
+    }
+    if (stat.isSymbolicLink())
+        throw new Error('preparation request cannot be a symlink');
+    if (!stat.isFile())
+        throw new Error('preparation request must be a regular file');
+    try {
+        return JSON.parse(fs.readFileSync(confined, 'utf8'));
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        throw new Error(`preparation request is not valid JSON: ${message}`);
+    }
+};
+export const prepareWithHre = async (options, hre, root = process.cwd()) => {
+    const rawRequest = readRequest(options.request, root);
+    const request = normalizePreparationRequest(rawRequest);
+    if (request.network !== options.network) {
+        throw new Error(`preparation request network ${request.network} does not match CLI network ${options.network}`);
+    }
+    const outputPath = confinedFile(root, options.output, 'preparation plan output');
+    const plan = await prepareWorkflow(hre, request);
+    return writePreparationPlanAtomic(outputPath, plan, root);
+};
+export const loadHardhat = async (root, requireFactory = createRequire) => {
+    const projectRequire = requireFactory(path.join(path.resolve(root), 'package.json'));
+    try {
+        projectRequire('hardhat/register');
+        return projectRequire('hardhat');
+    }
+    catch (requireError) {
+        try {
+            const hardhatModule = await import('hardhat');
+            return (hardhatModule.default ?? hardhatModule);
+        }
+        catch {
+            throw requireError;
+        }
+    }
+};
+export const prepareCommand = async (options, root = process.cwd()) => {
+    if (!isValidNetworkName(options.network)) {
+        throw new Error('network name may contain only letters, numbers, underscores, and hyphens');
+    }
+    process.env.HARDHAT_NETWORK = options.network;
+    const hre = await loadHardhat(root);
+    return prepareWithHre(options, hre, root);
+};
+//# sourceMappingURL=prepare.js.map

package/dist/commands/prepare.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"prepare.js","sourceRoot":"","sources":["../../src/commands/prepare.ts"],"names":[],"mappings":"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"}

package/dist/commands/sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/commands/sync.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAS1C;;GAEG;AACH,wBAAsB,WAAW,CAAC,OAAO,EAAE,WAAW,iBA+HrD"}
+{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/commands/sync.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAS1C;;GAEG;AACH,wBAAsB,WAAW,CAAC,OAAO,EAAE,WAAW,iBA2GrD"}

package/dist/commands/sync.js

@@ -1,6 +1,6 @@
 import chalk from 'chalk';
 import ora from 'ora';
-import { syncNetworkFile } from '../core/syncUpgradeJson.js';
+import { syncWithHre } from '../sync/index.js';
 import fs from 'fs-extra';
 import path from 'path';
 import { createRequire } from 'module';
@@ -61,38 +61,21 @@ export async function syncUpgrade(options) {
             }
         }
         spinner.succeed(`Hardhat 环境已加载 (网络: ${chalk.cyan(hre.network.name)})`);
-        // 5. 解析构造函数参数（如果有）
-        let constructorArgs = [];
-        if (options.constructorArgs) {
-            try {
-                // 尝试作为 JSON 数组解析
-                constructorArgs = JSON.parse(options.constructorArgs);
-                if (!Array.isArray(constructorArgs)) {
-                    throw new Error('构造函数参数必须是一个数组');
-                }
-                console.log(chalk.blue(`\n📝 构造函数参数: ${JSON.stringify(constructorArgs)}\n`));
-            }
-            catch (error) {
-                throw new Error(`构造函数参数格式错误: ${error.message}\n请使用 JSON 数组格式，例如: '["arg1", "arg2"]' 或 '[100, "0x123..."]'`);
-            }
-        }
-        // 6. 执行同步
+        // 5. 执行同步（EVM 保持 legacy forceImport；zkSync 使用显式原子 manifest writer）
         console.log('');
-        const result = await syncNetworkFile({
-            proxyAddress: options.proxy,
-            contractName: options.contract,
-            networkName: options.network,
-            constructorArgs: constructorArgs,
-            skipTxHash: options.skipTxHash,
-            hre
-        });
+        const result = await syncWithHre(options, hre, cwd);
         // 7. 显示成功信息
         console.log(chalk.green.bold('\n✅ 同步成功！\n'));
         console.log(chalk.cyan('同步结果摘要:'));
         console.log(chalk.gray('─'.repeat(60)));
-        console.log(`${chalk.white('代理合约:')} ${chalk.yellow(result.proxyAddress)}`);
-        console.log(`${chalk.white('实现合约:')} ${chalk.yellow(result.implementationAddress)}`);
-        console.log(`${chalk.white('网络文件:')} ${chalk.gray(result.networkFile)}`);
+        const proxyAddress = 'proxyAddress' in result ? result.proxyAddress : result.proxy;
+        const implementationAddress = 'implementationAddress' in result
+            ? result.implementationAddress
+            : result.implementation;
+        const manifestFile = 'networkFile' in result ? result.networkFile : result.manifestFile;
+        console.log(`${chalk.white('代理合约:')} ${chalk.yellow(proxyAddress)}`);
+        console.log(`${chalk.white('实现合约:')} ${chalk.yellow(implementationAddress)}`);
+        console.log(`${chalk.white('网络文件:')} ${chalk.gray(manifestFile)}`);
         console.log(chalk.gray('─'.repeat(60)));
         console.log('');
     }

package/dist/commands/sync.js.map

@@ -1 +1 @@
-{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/commands/sync.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/commands/sync.ts"],"names":[],"mappings":"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"}

package/dist/core/preparation/artifacts.d.ts

@@ -0,0 +1,21 @@
+import { type InterfaceAbi } from 'ethers';
+import type { GateToolArtifactIdentity, GateToolScheme } from './types.js';
+export interface GateToolArtifact {
+    _format: string;
+    contractName: string;
+    sourceName: string;
+    abi: InterfaceAbi;
+    bytecode: string;
+    deployedBytecode?: string;
+    linkReferences?: Record<string, unknown>;
+    deployedLinkReferences?: Record<string, unknown>;
+    factoryDeps?: string[] | Record<string, string>;
+}
+export declare const assertArtifactScheme: (artifact: GateToolArtifact, scheme: GateToolScheme) => void;
+interface ZkArtifactReader {
+    readArtifact(name: string): Promise<GateToolArtifact>;
+}
+export declare const collectZkFactoryDeps: (artifacts: ZkArtifactReader, rootArtifact: GateToolArtifact) => Promise<string[]>;
+export declare const artifactIdentity: (artifact: GateToolArtifact, scheme: GateToolScheme) => GateToolArtifactIdentity;
+export {};
+//# sourceMappingURL=artifacts.d.ts.map

package/dist/core/preparation/artifacts.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"artifacts.d.ts","sourceRoot":"","sources":["../../../src/core/preparation/artifacts.ts"],"names":[],"mappings":"AACA,OAAO,EAA0B,KAAK,YAAY,EAAE,MAAM,QAAQ,CAAC;AAGnE,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,oBAAoB,GAC/B,UAAU,gBAAgB,EAC1B,QAAQ,cAAc,KACrB,IAqBF,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,CAoClB,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAC3B,UAAU,gBAAgB,EAC1B,QAAQ,cAAc,KACrB,wBAkBF,CAAC"}

package/dist/core/preparation/artifacts.js

@@ -0,0 +1,80 @@
+import crypto from 'node:crypto';
+import { isHexString, keccak256 } from 'ethers';
+import { canonicalPreparationJson } from './normalize.js';
+const jsonSafe = (value) => JSON.parse(JSON.stringify(value));
+export const assertArtifactScheme = (artifact, scheme) => {
+    const expected = scheme === 'evm'
+        ? 'hh-sol-artifact-1'
+        : 'hh-zksolc-artifact-1';
+    if (artifact._format !== expected) {
+        throw new Error(`${scheme} requires artifact format ${expected}`);
+    }
+    if (!artifact.sourceName || !artifact.contractName || !artifact.bytecode || artifact.bytecode === '0x') {
+        throw new Error('artifact is missing source, contract, or bytecode');
+    }
+    if (!isHexString(artifact.bytecode))
+        throw new Error('artifact bytecode must be hex bytes');
+    if (scheme === 'zksync-eravm'
+        && (!artifact.factoryDeps
+            || typeof artifact.factoryDeps !== 'object'
+            || Array.isArray(artifact.factoryDeps))) {
+        throw new Error('hh-zksolc artifact factoryDeps must be an object');
+    }
+};
+const artifactName = (artifact) => (`${artifact.sourceName}:${artifact.contractName}`);
+export const collectZkFactoryDeps = async (artifacts, rootArtifact) => {
+    assertArtifactScheme(rootArtifact, 'zksync-eravm');
+    const visitedArtifacts = new Set([artifactName(rootArtifact)]);
+    const bytecodeHashes = new Set();
+    const result = [];
+    const addBytecode = (bytecode) => {
+        if (!isHexString(bytecode) || bytecode === '0x') {
+            throw new Error('zkSync factory dependency bytecode must be non-empty hex bytes');
+        }
+        const digest = keccak256(bytecode);
+        if (bytecodeHashes.has(digest))
+            return;
+        bytecodeHashes.add(digest);
+        result.push(bytecode.toLowerCase());
+    };
+    const visitDependencies = async (artifact) => {
+        assertArtifactScheme(artifact, 'zksync-eravm');
+        const dependencies = artifact.factoryDeps;
+        for (const dependencyName of Object.values(dependencies)) {
+            if (typeof dependencyName !== 'string' || dependencyName.trim() === '') {
+                throw new Error('zkSync factory dependency must name an artifact');
+            }
+            const normalizedName = dependencyName.trim();
+            if (visitedArtifacts.has(normalizedName))
+                continue;
+            visitedArtifacts.add(normalizedName);
+            const dependency = await artifacts.readArtifact(normalizedName);
+            assertArtifactScheme(dependency, 'zksync-eravm');
+            addBytecode(dependency.bytecode);
+            await visitDependencies(dependency);
+        }
+    };
+    addBytecode(rootArtifact.bytecode);
+    await visitDependencies(rootArtifact);
+    return result;
+};
+export const artifactIdentity = (artifact, scheme) => {
+    assertArtifactScheme(artifact, scheme);
+    const digest = crypto.createHash('sha256').update(canonicalPreparationJson(jsonSafe({
+        _format: artifact._format,
+        sourceName: artifact.sourceName,
+        contractName: artifact.contractName,
+        abi: artifact.abi,
+        bytecode: artifact.bytecode,
+        deployedBytecode: artifact.deployedBytecode ?? '0x',
+        linkReferences: artifact.linkReferences ?? {},
+        deployedLinkReferences: artifact.deployedLinkReferences ?? {},
+        factoryDeps: artifact.factoryDeps ?? [],
+    }))).digest('hex');
+    return {
+        sourceName: artifact.sourceName,
+        contractName: artifact.contractName,
+        digest,
+    };
+};
+//# sourceMappingURL=artifacts.js.map

package/dist/core/preparation/artifacts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../../src/core/preparation/artifacts.ts"],"names":[],"mappings":"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"}