gate-evm-tools 1.0.20 → 1.0.22

package/dist/core/syncUpgradeJson.js

@@ -1,6 +1,7 @@
 import * as path from 'path';
 import * as fs from 'fs';
-import { forceImportWithRetry, getCodeStatus, getOpenZeppelinManifestFile, mergeUnsafeAllow, } from '../utils/openzeppelin.js';
+import { forceImportWithRetry, getCodeStatus, getOpenZeppelinManifestPaths, mergeUnsafeAllow, } from '../utils/openzeppelin.js';
+import { withManifestTransaction } from '../utils/manifestTransaction.js';
 /**
  * 同步链上合约状态到本地 .openzeppelin 网络文件
  *
@@ -103,158 +104,176 @@ export async function syncNetworkFile(options) {
         }
     }
     console.log('');
-    // Step 4: 使用 OpenZeppelin 官方的 forceImport 方法同步状态
-    console.log('📊 Step 4: 使用 forceImport 同步链上状态...');
-    console.log('   这会自动更新 .openzeppelin 文件，包括完整的存储布局和命名空间');
-    console.log('');
-    try {
-        const ContractFactory = await hre.ethers.getContractFactory(CONTRACT_NAME);
-        if (CONSTRUCTOR_ARGS.length > 0) {
-            console.log(`   📝 使用构造函数参数:`, CONSTRUCTOR_ARGS);
+    const projectRoot = process.cwd();
+    const manifestPaths = await getOpenZeppelinManifestPaths(hre);
+    const networkFilePath = manifestPaths.file;
+    const transaction = await withManifestTransaction({
+        root: projectRoot,
+        manifestFile: networkFilePath,
+        fallbackFile: manifestPaths.fallbackFile,
+        operation: async ({ writeManifestAtomic }) => {
+            // Step 4: 使用 OpenZeppelin 官方的 forceImport 方法同步状态
+            console.log('📊 Step 4: 使用 forceImport 同步链上状态...');
+            console.log('   这会自动更新 .openzeppelin 文件，包括完整的存储布局和命名空间');
             console.log('');
-        }
-        // forceImport: 强制导入已存在的代理，更新本地 .openzeppelin 文件
-        // 这是 OpenZeppelin 官方推荐的同步方式
-        const importOptions = {
-            kind: 'uups',
-            unsafeAllow: mergeUnsafeAllow()
-        };
-        // 如果有构造函数参数，添加到选项中
-        if (CONSTRUCTOR_ARGS.length > 0) {
-            importOptions.constructorArgs = CONSTRUCTOR_ARGS;
-        }
-        await forceImportWithRetry(hre, PROXY_ADDRESS, ContractFactory, importOptions);
-        console.log('✅ forceImport 完成！');
-        console.log('');
-    }
-    catch (error) {
-        console.error('❌ forceImport 失败:', error.message);
-        console.error(`   代理合约状态: ${await getCodeStatus(hre, PROXY_ADDRESS)}`);
-        console.error(`   实现合约状态: ${await getCodeStatus(hre, currentImplementation)}`);
-        console.error('');
-        throw error;
-    }
-    // Step 5: 查找正确的网络文件并补充交易哈希
-    console.log('📊 Step 5: 查找网络文件并补充交易哈希...');
-    const networkFilePath = await getOpenZeppelinManifestFile(hre);
-    const actualNetworkName = path.basename(networkFilePath, '.json');
-    console.log('   ✅ OpenZeppelin manifest 文件:', path.basename(networkFilePath));
-    if (!fs.existsSync(networkFilePath)) {
-        const error = new Error('未找到 .openzeppelin 网络文件');
-        console.error('❌ 错误: 未找到 .openzeppelin 网络文件');
-        console.error(`   OpenZeppelin 预期文件: ${networkFilePath}`);
-        console.error('   请确认 forceImport 已成功执行');
-        throw error;
-    }
-    console.log('   📄 使用网络文件:', actualNetworkName + '.json');
-    console.log('');
-    let networkFile = JSON.parse(fs.readFileSync(networkFilePath, 'utf8'));
-    // 查找当前代理的实现信息
-    const proxyInfo = networkFile.proxies?.find((p) => p.address.toLowerCase() === PROXY_ADDRESS.toLowerCase());
-    if (!proxyInfo) {
-        const error = new Error('代理信息未找到');
-        console.error('❌ 错误: 代理信息未找到');
-        throw error;
-    }
-    // 查找实现合约的布局信息
-    let layoutInfo = null;
-    let layoutHash = '';
-    let needsSave = false;
-    for (const [hash, impl] of Object.entries(networkFile.impls || {})) {
-        const implData = impl;
-        // 检查是否匹配：
-        // 1. 直接匹配 address 字段
-        // 2. 在 allAddresses 数组中查找（多次升级可能共享相同布局）
-        const isMatch = implData.address.toLowerCase() === currentImplementation.toLowerCase() ||
-            (implData.allAddresses && Array.isArray(implData.allAddresses) &&
-                implData.allAddresses.some((addr) => addr.toLowerCase() === currentImplementation.toLowerCase()));
-        if (isMatch) {
-            layoutHash = hash;
-            layoutInfo = implData.layout;
-            console.log('   ✅ 找到实现合约的布局信息');
-            if (implData.allAddresses && implData.allAddresses.length > 1) {
-                console.log(`   📋 该布局被 ${implData.allAddresses.length} 个实现合约共享`);
-                console.log(`      主地址: ${implData.address}`);
-                console.log(`      所有地址: ${implData.allAddresses.join(', ')}`);
+            try {
+                const ContractFactory = await hre.ethers.getContractFactory(CONTRACT_NAME);
+                if (CONSTRUCTOR_ARGS.length > 0) {
+                    console.log(`   📝 使用构造函数参数:`, CONSTRUCTOR_ARGS);
+                    console.log('');
+                }
+                // forceImport: 强制导入已存在的代理，更新本地 .openzeppelin 文件
+                // 这是 OpenZeppelin 官方推荐的同步方式
+                const importOptions = {
+                    kind: 'uups',
+                    unsafeAllow: mergeUnsafeAllow()
+                };
+                // 如果有构造函数参数，添加到选项中
+                if (CONSTRUCTOR_ARGS.length > 0) {
+                    importOptions.constructorArgs = CONSTRUCTOR_ARGS;
+                }
+                await forceImportWithRetry(hre, PROXY_ADDRESS, ContractFactory, importOptions);
+                console.log('✅ forceImport 完成！');
+                console.log('');
             }
+            catch (error) {
+                console.error('❌ forceImport 失败:', error.message);
+                console.error(`   代理合约状态: ${await getCodeStatus(hre, PROXY_ADDRESS)}`);
+                console.error(`   实现合约状态: ${await getCodeStatus(hre, currentImplementation)}`);
+                console.error('');
+                throw error;
+            }
+            // Step 5: 查找正确的网络文件并补充交易哈希
+            console.log('📊 Step 5: 查找网络文件并补充交易哈希...');
+            const actualNetworkName = path.basename(networkFilePath, '.json');
+            console.log('   ✅ OpenZeppelin manifest 文件:', path.basename(networkFilePath));
+            if (!fs.existsSync(networkFilePath)) {
+                const error = new Error('未找到 .openzeppelin 网络文件');
+                console.error('❌ 错误: 未找到 .openzeppelin 网络文件');
+                console.error(`   OpenZeppelin 预期文件: ${networkFilePath}`);
+                console.error('   请确认 forceImport 已成功执行');
+                throw error;
+            }
+            console.log('   📄 使用网络文件:', actualNetworkName + '.json');
             console.log('');
-            // 检查并补充交易哈希（只对主地址有效）
-            if (implData.address.toLowerCase() === currentImplementation.toLowerCase()) {
-                if (!implData.txHash && implTxHash && implTxHash !== '0x0') {
-                    console.log('   💾 补充交易哈希到记录...');
-                    console.log('      交易哈希:', implTxHash);
-                    // 重新构建对象，确保字段顺序
-                    const newImpl = {
-                        address: implData.address,
-                        txHash: implTxHash,
-                        layout: implData.layout
-                    };
-                    // 保留 allAddresses 字段（如果存在）
-                    if (implData.allAddresses) {
-                        newImpl.allAddresses = implData.allAddresses;
+            let networkFile = JSON.parse(fs.readFileSync(networkFilePath, 'utf8'));
+            // 查找当前代理的实现信息
+            const proxyInfo = networkFile.proxies?.find((p) => p.address.toLowerCase() === PROXY_ADDRESS.toLowerCase());
+            if (!proxyInfo) {
+                const error = new Error('代理信息未找到');
+                console.error('❌ 错误: 代理信息未找到');
+                throw error;
+            }
+            // 查找实现合约的布局信息
+            let layoutInfo = null;
+            let layoutHash = '';
+            let needsSave = false;
+            for (const [hash, impl] of Object.entries(networkFile.impls || {})) {
+                const implData = impl;
+                // 检查是否匹配：
+                // 1. 直接匹配 address 字段
+                // 2. 在 allAddresses 数组中查找（多次升级可能共享相同布局）
+                const isMatch = implData.address.toLowerCase() === currentImplementation.toLowerCase() ||
+                    (implData.allAddresses && Array.isArray(implData.allAddresses) &&
+                        implData.allAddresses.some((addr) => addr.toLowerCase() === currentImplementation.toLowerCase()));
+                if (isMatch) {
+                    layoutHash = hash;
+                    layoutInfo = implData.layout;
+                    console.log('   ✅ 找到实现合约的布局信息');
+                    if (implData.allAddresses && implData.allAddresses.length > 1) {
+                        console.log(`   📋 该布局被 ${implData.allAddresses.length} 个实现合约共享`);
+                        console.log(`      主地址: ${implData.address}`);
+                        console.log(`      所有地址: ${implData.allAddresses.join(', ')}`);
                     }
-                    // 替换原有的实现记录
-                    networkFile.impls[hash] = newImpl;
-                    needsSave = true;
+                    console.log('');
+                    // 检查并补充交易哈希（只对主地址有效）
+                    if (implData.address.toLowerCase() === currentImplementation.toLowerCase()) {
+                        if (!implData.txHash && implTxHash && implTxHash !== '0x0') {
+                            console.log('   💾 补充交易哈希到记录...');
+                            console.log('      交易哈希:', implTxHash);
+                            // 重新构建对象，确保字段顺序
+                            const newImpl = {
+                                address: implData.address,
+                                txHash: implTxHash,
+                                layout: implData.layout
+                            };
+                            // 保留 allAddresses 字段（如果存在）
+                            if (implData.allAddresses) {
+                                newImpl.allAddresses = implData.allAddresses;
+                            }
+                            // 替换原有的实现记录
+                            networkFile.impls[hash] = newImpl;
+                            needsSave = true;
+                        }
+                        else if (implData.txHash) {
+                            console.log('   ✅ 交易哈希已存在:', implData.txHash);
+                        }
+                        else {
+                            console.log('   ⚠️  未获取到交易哈希');
+                        }
+                    }
+                    break;
+                }
+            }
+            // 保存更新后的文件
+            if (needsSave) {
+                try {
+                    writeManifestAtomic(Buffer.from(`${JSON.stringify(networkFile, null, 2)}\n`));
+                    console.log('   💾 文件已保存');
                 }
-                else if (implData.txHash) {
-                    console.log('   ✅ 交易哈希已存在:', implData.txHash);
+                catch (error) {
+                    console.error('   ❌ 保存文件失败:', error.message);
+                    throw error;
                 }
-                else {
-                    console.log('   ⚠️  未获取到交易哈希');
+            }
+            console.log('');
+            if (!layoutInfo) {
+                const error = new Error('未找到实现合约的布局信息');
+                console.error('❌ 错误: 未找到实现合约的布局信息');
+                throw error;
+            }
+            console.log('✅ 同步结果验证通过！');
+            console.log('');
+            // 总结
+            console.log('=====================================');
+            console.log('✅ 同步完成！');
+            console.log('=====================================');
+            console.log('');
+            console.log('📋 同步摘要:');
+            console.log('-------------------------------------');
+            console.log('代理合约:', PROXY_ADDRESS);
+            console.log('实现合约:', currentImplementation);
+            console.log('布局哈希:', layoutHash.substring(0, 16) + '...');
+            console.log('存储变量:', layoutInfo.storage?.length || 0, '个');
+            console.log('命名空间:', Object.keys(layoutInfo.namespaces || {}).length, '个');
+            console.log('类型定义:', Object.keys(layoutInfo.types || {}).length, '个');
+            console.log('网络文件:', networkFilePath);
+            console.log('-------------------------------------');
+            console.log('');
+            // 显示命名空间详情
+            if (layoutInfo.namespaces && Object.keys(layoutInfo.namespaces).length > 0) {
+                console.log('📦 命名空间详情:');
+                for (const [namespace, vars] of Object.entries(layoutInfo.namespaces)) {
+                    console.log(`   - ${namespace}: ${vars.length} 个变量`);
                 }
+                console.log('');
             }
-            break;
-        }
-    }
-    // 保存更新后的文件
-    if (needsSave) {
-        try {
-            fs.writeFileSync(networkFilePath, JSON.stringify(networkFile, null, 2));
-            console.log('   💾 文件已保存');
-        }
-        catch (error) {
-            console.error('   ❌ 保存文件失败:', error.message);
-        }
-    }
-    console.log('');
-    if (!layoutInfo) {
-        const error = new Error('未找到实现合约的布局信息');
-        console.error('❌ 错误: 未找到实现合约的布局信息');
-        throw error;
-    }
-    console.log('✅ 同步结果验证通过！');
-    console.log('');
-    // 总结
-    console.log('=====================================');
-    console.log('✅ 同步完成！');
-    console.log('=====================================');
-    console.log('');
-    console.log('📋 同步摘要:');
-    console.log('-------------------------------------');
-    console.log('代理合约:', PROXY_ADDRESS);
-    console.log('实现合约:', currentImplementation);
-    console.log('布局哈希:', layoutHash.substring(0, 16) + '...');
-    console.log('存储变量:', layoutInfo.storage?.length || 0, '个');
-    console.log('命名空间:', Object.keys(layoutInfo.namespaces || {}).length, '个');
-    console.log('类型定义:', Object.keys(layoutInfo.types || {}).length, '个');
-    console.log('网络文件:', networkFilePath);
-    console.log('-------------------------------------');
-    console.log('');
-    // 显示命名空间详情
-    if (layoutInfo.namespaces && Object.keys(layoutInfo.namespaces).length > 0) {
-        console.log('📦 命名空间详情:');
-        for (const [namespace, vars] of Object.entries(layoutInfo.namespaces)) {
-            console.log(`   - ${namespace}: ${vars.length} 个变量`);
-        }
-        console.log('');
-    }
+            return {
+                proxyAddress: PROXY_ADDRESS,
+                implementationAddress: currentImplementation,
+                layoutHash: layoutHash.substring(0, 16) + '...',
+                networkFile: networkFilePath,
+                success: true,
+            };
+        },
+    });
+    console.log('Manifest before hash:', transaction.report.beforeHash);
+    console.log('Manifest after hash:', transaction.report.afterHash);
+    console.log('Sync report:', transaction.reportFile);
     return {
-        proxyAddress: PROXY_ADDRESS,
-        implementationAddress: currentImplementation,
-        layoutHash: layoutHash.substring(0, 16) + '...',
-        networkFile: networkFilePath,
-        success: true
+        ...transaction.value,
+        manifestTransaction: transaction.report,
+        syncReport: transaction.reportFile,
     };
 }
 //# sourceMappingURL=syncUpgradeJson.js.map

package/dist/core/syncUpgradeJson.js.map

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

package/dist/core/validateAndGenerateCalldata.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validateAndGenerateCalldata.d.ts","sourceRoot":"","sources":["../../src/core/validateAndGenerateCalldata.ts"],"names":[],"mappings":"AAUA,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;AAwED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,2BAA2B,CAAC,OAAO,EAAE,eAAe;;;;;;;;;;;;;;;GAgDzE"}
+{"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;;;;;;;;;;;;;;;GAgDzE"}

package/dist/core/validateAndGenerateCalldata.js

@@ -1,7 +1,8 @@
 import { validateUpgradeSafety } from '@openzeppelin/upgrades-core';
 import * as path from 'path';
 import * as fs from 'fs';
-import { forceImportWithRetry, getCodeStatus, getOpenZeppelinManifestFile, mergeUnsafeAllow, } from '../utils/openzeppelin.js';
+import { forceImportWithRetry, getCodeStatus, getOpenZeppelinManifestPaths, mergeUnsafeAllow, } from '../utils/openzeppelin.js';
+import { withManifestLock, withTemporaryManifestTransaction, } from '../utils/manifestTransaction.js';
 /**
  * 检测地址是代理合约还是实现合约
  */
@@ -41,8 +42,7 @@ function createForceImportOptions(constructorArgs, unsafeAllow) {
     return importOptions;
 }
 async function registerProxyForValidation(options) {
-    const { proxyAddress, contractName, constructorArgs, unsafeAllow, hre } = options;
-    const manifestFile = await getOpenZeppelinManifestFile(hre);
+    const { proxyAddress, contractName, constructorArgs, unsafeAllow, manifestFile, hre, } = options;
     const ContractFactory = await hre.ethers.getContractFactory(contractName);
     console.log('🗂️ Step 2.5: 同步当前代理到 OpenZeppelin manifest...');
     console.log('   Manifest 文件:', path.basename(manifestFile));
@@ -203,78 +203,59 @@ async function validateImplementationContract(options) {
     // Step 2: 导入链上实现合约信息（临时）
     console.log('🔐 Step 2: 导入链上实现合约信息...');
     console.log('');
-    let forceImportSuccess = false;
-    const openzeppelinFile = await getOpenZeppelinManifestFile(hre);
-    // 备份现有的 .openzeppelin 文件（如果存在）
-    let backupData = null;
-    if (fs.existsSync(openzeppelinFile)) {
-        console.log('📋 检测到已存在的 .openzeppelin 文件，将备份...');
-        backupData = JSON.parse(fs.readFileSync(openzeppelinFile, 'utf8'));
-    }
-    try {
-        // 尝试 forceImport 链上的实现合约
-        console.log(`📥 导入实现合约: ${implementationAddress}`);
-        // 获取链上实现合约的工厂（猜测合约名，或使用通用方法）
-        const OldContractFactory = await hre.ethers.getContractFactory(contractName);
-        await forceImportWithRetry(hre, implementationAddress, OldContractFactory, createForceImportOptions(constructorArgs, unsafeAllow));
-        console.log('✅ 实现合约信息导入成功');
-        console.log('');
-        forceImportSuccess = true;
-    }
-    catch (importError) {
-        console.log('⚠️  导入失败，尝试继续验证...');
-        console.log(`   错误: ${importError.message}`);
-        console.log(`   实现合约状态: ${await getCodeStatus(hre, implementationAddress)}`);
-        console.log('');
-    }
-    // Step 3: 验证存储布局兼容性
-    console.log('🔐 Step 3: 验证存储布局兼容性...');
+    const manifestPaths = await getOpenZeppelinManifestPaths(hre);
+    await withTemporaryManifestTransaction({
+        root: process.cwd(),
+        manifestFile: manifestPaths.file,
+        fallbackFile: manifestPaths.fallbackFile,
+        operation: async () => {
+            try {
+                // 尝试 forceImport 链上的实现合约
+                console.log(`📥 导入实现合约: ${implementationAddress}`);
+                // 获取链上实现合约的工厂（猜测合约名，或使用通用方法）
+                const OldContractFactory = await hre.ethers.getContractFactory(contractName);
+                await forceImportWithRetry(hre, implementationAddress, OldContractFactory, createForceImportOptions(constructorArgs, unsafeAllow));
+                console.log('✅ 实现合约信息导入成功');
+                console.log('');
+            }
+            catch (importError) {
+                console.log('⚠️  导入失败，尝试继续验证...');
+                console.log(`   错误: ${importError.message}`);
+                console.log(`   实现合约状态: ${await getCodeStatus(hre, implementationAddress)}`);
+                console.log('');
+            }
+            // Step 3: 验证存储布局兼容性
+            console.log('🔐 Step 3: 验证存储布局兼容性...');
+            console.log('');
+            try {
+                const NewContractFactory = await hre.ethers.getContractFactory(contractName);
+                const validateOptions = {
+                    kind: 'uups',
+                    unsafeSkipStorageCheck: false,
+                };
+                if (unsafeAllow) {
+                    validateOptions.unsafeAllow = unsafeAllow;
+                }
+                if (constructorArgs.length > 0) {
+                    validateOptions.constructorArgs = constructorArgs;
+                }
+                // 使用实现合约地址作为"代理"地址进行验证
+                // Hardhat Upgrades 会读取该地址的合约并与新合约比较存储布局
+                await hre.upgrades.validateUpgrade(implementationAddress, NewContractFactory, validateOptions);
+                console.log('✅ 存储布局兼容性验证通过！');
+                console.log('   ℹ️  已验证：存储布局兼容、可以安全升级');
+                console.log('');
+            }
+            catch (error) {
+                console.error('❌ 存储布局验证失败:', error.message);
+                console.error('');
+                console.error('⚠️  存储布局不兼容，不能升级！');
+                throw error;
+            }
+        },
+    });
+    console.log('🔄 已按原始文件名和字节恢复 OpenZeppelin manifest');
     console.log('');
-    try {
-        const NewContractFactory = await hre.ethers.getContractFactory(contractName);
-        const validateOptions = {
-            kind: 'uups',
-            unsafeSkipStorageCheck: false,
-        };
-        if (unsafeAllow) {
-            validateOptions.unsafeAllow = unsafeAllow;
-        }
-        if (constructorArgs.length > 0) {
-            validateOptions.constructorArgs = constructorArgs;
-        }
-        // 使用实现合约地址作为"代理"地址进行验证
-        // Hardhat Upgrades 会读取该地址的合约并与新合约比较存储布局
-        await hre.upgrades.validateUpgrade(implementationAddress, NewContractFactory, validateOptions);
-        console.log('✅ 存储布局兼容性验证通过！');
-        console.log('   ℹ️  已验证：存储布局兼容、可以安全升级');
-        console.log('');
-    }
-    catch (error) {
-        console.error('❌ 存储布局验证失败:', error.message);
-        console.error('');
-        console.error('⚠️  存储布局不兼容，不能升级！');
-        // 恢复备份
-        if (backupData) {
-            console.log('🔄 恢复 .openzeppelin 文件备份...');
-            fs.writeFileSync(openzeppelinFile, JSON.stringify(backupData, null, 2));
-        }
-        else if (forceImportSuccess && fs.existsSync(openzeppelinFile)) {
-            console.log('🧹 清理临时导入的 .openzeppelin 文件...');
-            fs.unlinkSync(openzeppelinFile);
-        }
-        throw error;
-    }
-    // 清理：恢复原始的 .openzeppelin 文件
-    if (backupData) {
-        console.log('🔄 恢复 .openzeppelin 文件到原始状态...');
-        fs.writeFileSync(openzeppelinFile, JSON.stringify(backupData, null, 2));
-        console.log('');
-    }
-    else if (forceImportSuccess && fs.existsSync(openzeppelinFile)) {
-        console.log('🧹 清理临时导入的 .openzeppelin 文件...');
-        fs.unlinkSync(openzeppelinFile);
-        console.log('');
-    }
     // Step 4: 部署新的实现合约
     console.log('📦 Step 4: 部署新的实现合约...');
     try {
@@ -505,46 +486,55 @@ async function validateProxyUpgrade(options) {
             throw error;
         }
     }
-    await registerProxyForValidation({
-        proxyAddress: PROXY_ADDRESS,
-        contractName: OLD_CONTRACT_NAME,
-        constructorArgs: CONSTRUCTOR_ARGS,
-        unsafeAllow,
-        hre
+    const manifestPaths = await getOpenZeppelinManifestPaths(hre);
+    await withManifestLock({
+        root: process.cwd(),
+        manifestFile: manifestPaths.file,
+        fallbackFile: manifestPaths.fallbackFile,
+        operation: async ({ manifestFile }) => {
+            await registerProxyForValidation({
+                proxyAddress: PROXY_ADDRESS,
+                contractName: OLD_CONTRACT_NAME,
+                constructorArgs: CONSTRUCTOR_ARGS,
+                unsafeAllow,
+                manifestFile,
+                hre,
+            });
+            // Step 3: 使用 Hardhat Upgrades 插件进行验证
+            if (isSameContract) {
+                console.log('🔐 Step 3: 使用 Hardhat Upgrades 插件进行链上验证（主要验证）...');
+            }
+            else {
+                console.log('🔐 Step 3: 使用 Hardhat Upgrades 插件进行额外验证...');
+            }
+            try {
+                // 验证新实现合约是否可以安全升级
+                // 这会从链上读取当前实现合约并与新合约进行比较
+                const validateOptions = {
+                    kind: 'uups',
+                };
+                if (unsafeAllow) {
+                    validateOptions.unsafeAllow = unsafeAllow;
+                }
+                // 如果有构造函数参数，添加到验证选项中
+                if (CONSTRUCTOR_ARGS.length > 0) {
+                    validateOptions.constructorArgs = CONSTRUCTOR_ARGS;
+                }
+                await hre.upgrades.validateUpgrade(PROXY_ADDRESS, NewContractFactory, validateOptions);
+                console.log('✅ Hardhat Upgrades 插件验证通过！');
+                if (isSameContract) {
+                    console.log('   ℹ️  已验证：存储布局兼容、无危险操作、升级安全');
+                }
+                console.log('');
+            }
+            catch (error) {
+                console.error('❌ Hardhat Upgrades 验证失败:', error.message);
+                console.error('');
+                console.error('⚠️  升级存在风险，不建议继续！');
+                throw error;
+            }
+        },
     });
-    // Step 3: 使用 Hardhat Upgrades 插件进行验证
-    if (isSameContract) {
-        console.log('🔐 Step 3: 使用 Hardhat Upgrades 插件进行链上验证（主要验证）...');
-    }
-    else {
-        console.log('🔐 Step 3: 使用 Hardhat Upgrades 插件进行额外验证...');
-    }
-    try {
-        // 验证新实现合约是否可以安全升级
-        // 这会从链上读取当前实现合约并与新合约进行比较
-        const validateOptions = {
-            kind: 'uups',
-        };
-        if (unsafeAllow) {
-            validateOptions.unsafeAllow = unsafeAllow;
-        }
-        // 如果有构造函数参数，添加到验证选项中
-        if (CONSTRUCTOR_ARGS.length > 0) {
-            validateOptions.constructorArgs = CONSTRUCTOR_ARGS;
-        }
-        await hre.upgrades.validateUpgrade(PROXY_ADDRESS, NewContractFactory, validateOptions);
-        console.log('✅ Hardhat Upgrades 插件验证通过！');
-        if (isSameContract) {
-            console.log('   ℹ️  已验证：存储布局兼容、无危险操作、升级安全');
-        }
-        console.log('');
-    }
-    catch (error) {
-        console.error('❌ Hardhat Upgrades 验证失败:', error.message);
-        console.error('');
-        console.error('⚠️  升级存在风险，不建议继续！');
-        throw error;
-    }
     // Step 4: 生成 upgradeToAndCall 的 calldata
     console.log('📝 Step 4: 生成 upgradeToAndCall calldata...');
     // 准备初始化数据（如果升级后需要调用某个函数）