gate-evm-tools 1.0.28 → 1.0.31

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

@@ -0,0 +1,63 @@
+import { type Provider } from 'ethers';
+import { getDeployData } from '@openzeppelin/hardhat-upgrades/dist/utils/deploy-impl.js';
+import type { HardhatRuntimeEnvironment } from 'hardhat/types';
+import { type TargetManifestData } from './manifest.js';
+export interface EvmManifestSyncOptions {
+    root?: string;
+    scheme: 'evm';
+    network: string;
+    target: string;
+    proxy: string;
+    contract: string;
+    constructorArgs?: unknown[];
+    unsafeAllow?: string[];
+    skipTxHash?: boolean;
+    /** May describe an upgrade; only a verified creation receipt can fill deployment txHash. */
+    transactionHash?: string;
+    hre: HardhatRuntimeEnvironment & {
+        ethers: {
+            provider: Pick<Provider, 'getNetwork' | 'getCode' | 'getTransactionReceipt'>;
+        };
+    };
+}
+type Candidate = Awaited<ReturnType<typeof getDeployData>>;
+export interface EvmManifestSyncDependencies {
+    loadCandidate?: typeof getDeployData;
+    assertImplementationSafe?: (candidate: Candidate) => void;
+}
+/** Explicit project/target registry sync. Never calls Manifest.forNetwork or forceImport. */
+export declare const prepareEvmManifestCandidate: (options: EvmManifestSyncOptions & {
+    compile?: boolean;
+}, dependencies?: EvmManifestSyncDependencies) => Promise<{
+    deploymentTxHash?: string | undefined;
+    root: string;
+    paths: import("./manifest.js").TargetManifestPaths;
+    chainId: number;
+    proxy: string;
+    implementation: string;
+    artifact: import("./types.js").GateToolArtifactIdentity;
+    versionKey: string;
+    layout: import("@openzeppelin/upgrades-core").StorageLayout;
+    layoutHash: string;
+}>;
+export type EvmManifestCandidate = Awaited<ReturnType<typeof prepareEvmManifestCandidate>>;
+/** Pure merge, shared by legacy sync and the delivery multi-file journal. */
+export declare function mergeEvmManifestCandidate(current: TargetManifestData, candidate: Pick<EvmManifestCandidate, 'versionKey' | 'proxy' | 'implementation' | 'layout' | 'layoutHash'> & {
+    deploymentTxHash?: string;
+}): TargetManifestData;
+export declare const syncEvmManifest: (options: EvmManifestSyncOptions, dependencies?: EvmManifestSyncDependencies) => Promise<{
+    manifestTransaction: import("../../utils/manifestTransaction.js").ManifestTransactionReport;
+    syncReport: string;
+    scheme: "evm";
+    network: string;
+    target: string;
+    chainId: string;
+    proxy: string;
+    implementation: string;
+    artifact: import("./types.js").GateToolArtifactIdentity;
+    layoutHash: string;
+    manifestDigest: string;
+    manifestFile: string;
+}>;
+export {};
+//# sourceMappingURL=evmManifestSync.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"evmManifestSync.d.ts","sourceRoot":"","sources":["../../../src/core/preparation/evmManifestSync.ts"],"names":[],"mappings":"AAGA,OAAO,EAA+B,KAAK,QAAQ,EAAE,MAAM,QAAQ,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,0DAA0D,CAAC;AAEzF,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAI/D,OAAO,EAAsE,KAAK,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAG5H,MAAM,WAAW,sBAAsB;IACrC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,KAAK,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,OAAO,EAAE,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,4FAA4F;IAC5F,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,GAAG,EAAE,yBAAyB,GAAG;QAC/B,MAAM,EAAE;YAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,YAAY,GAAG,SAAS,GAAG,uBAAuB,CAAC,CAAA;SAAE,CAAC;KAC1F,CAAC;CACH;AAED,KAAK,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC,CAAC;AAC3D,MAAM,WAAW,2BAA2B;IAC1C,aAAa,CAAC,EAAE,OAAO,aAAa,CAAC;IACrC,wBAAwB,CAAC,EAAE,CAAC,SAAS,EAAE,SAAS,KAAK,IAAI,CAAC;CAC3D;AAUD,6FAA6F;AAC7F,eAAO,MAAM,2BAA2B,GACtC,SAAS,sBAAsB,GAAG;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,EACvD,eAAc,2BAAgC;;;;;;;;;;;EAyD/C,CAAC;AACF,MAAM,MAAM,oBAAoB,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,2BAA2B,CAAC,CAAC,CAAC;AAC3F,6EAA6E;AAC7E,wBAAgB,yBAAyB,CAAC,OAAO,EAAC,kBAAkB,EAAE,SAAS,EAAC,IAAI,CAAC,oBAAoB,EAAC,YAAY,GAAC,OAAO,GAAC,gBAAgB,GAAC,QAAQ,GAAC,YAAY,CAAC,GAAC;IAAC,gBAAgB,CAAC,EAAC,MAAM,CAAA;CAAC,GAAE,kBAAkB,CAsBpN;AACD,eAAO,MAAM,eAAe,GAAU,SAAQ,sBAAsB,EAAE,eAAa,2BAA8B;;;;;;;;;;;;;EAkChH,CAAC"}

package/dist/core/preparation/evmManifestSync.js

@@ -0,0 +1,146 @@
+import crypto from 'node:crypto';
+import fs from 'node:fs';
+import path from 'node:path';
+import { ContractFactory, getAddress } from 'ethers';
+import { getDeployData } from '@openzeppelin/hardhat-upgrades/dist/utils/deploy-impl.js';
+import { assertUpgradeSafe, getImplementationAddress } from '@openzeppelin/upgrades-core';
+import { BytecodeChecker } from '../BytecodeChecker.js';
+import { artifactIdentity, assertArtifactScheme } from './artifacts.js';
+import { hashStorageLayout, parseTargetManifest, resolveTargetManifestPaths } from './manifest.js';
+import { withManifestTransaction } from '../../utils/manifestTransaction.js';
+const readManifest = (file, fallback) => {
+    const selected = fs.existsSync(file) ? file : fs.existsSync(fallback) ? fallback : undefined;
+    // withManifestTransaction has already rejected ambiguity, symlinks and non-files.
+    return selected
+        ? parseTargetManifest(fs.readFileSync(selected))
+        : { manifestVersion: '3.2', impls: {}, proxies: [] };
+};
+/** Explicit project/target registry sync. Never calls Manifest.forNetwork or forceImport. */
+export const prepareEvmManifestCandidate = async (options, dependencies = {}) => {
+    const { hre } = options;
+    if (options.scheme !== 'evm' || hre.network.config.zksync === true) {
+        throw new Error('native EVM sync requires an EVM network');
+    }
+    if (options.network !== hre.network.name)
+        throw new Error('sync network does not match Hardhat network');
+    if (options.target !== options.network)
+        throw new Error('EVM sync requires target to equal the active network');
+    const root = path.resolve(options.root ?? hre.config.paths.root);
+    if (root !== path.resolve(hre.config.paths.root))
+        throw new Error('sync root does not match the Hardhat project root');
+    const chainId = Number((await hre.ethers.provider.getNetwork()).chainId);
+    if (!Number.isSafeInteger(chainId) || chainId <= 0)
+        throw new Error('provider chainId is invalid');
+    if (hre.network.config.chainId !== undefined && hre.network.config.chainId !== chainId) {
+        throw new Error(`provider chainId ${chainId} does not match configured chainId ${hre.network.config.chainId}`);
+    }
+    const paths = resolveTargetManifestPaths(root, options.target, chainId);
+    const proxy = getAddress(options.proxy).toLowerCase();
+    if (options.transactionHash !== undefined && !/^0x[0-9a-fA-F]{64}$/.test(options.transactionHash)) {
+        throw new Error('sync transactionHash must be 32-byte hex');
+    }
+    if (options.compile !== false)
+        await hre.run('compile', { quiet: true });
+    const artifact = await hre.artifacts.readArtifact(options.contract);
+    assertArtifactScheme(artifact, 'evm');
+    const factory = new ContractFactory(artifact.abi, artifact.bytecode);
+    const candidate = await (dependencies.loadCandidate ?? getDeployData)(hre, factory, {
+        kind: 'uups',
+        constructorArgs: options.constructorArgs ?? [],
+        ...(options.unsafeAllow ? { unsafeAllow: options.unsafeAllow } : {}),
+    });
+    (dependencies.assertImplementationSafe ?? ((data) => {
+        assertUpgradeSafe(data.validations, data.version, data.fullOpts);
+    }))(candidate);
+    const versionKey = candidate.version.linkedWithoutMetadata;
+    if (!/^[a-f0-9]{64}$/.test(versionKey))
+        throw new Error('OpenZeppelin implementation version is invalid');
+    const implementation = getAddress(await getImplementationAddress(hre.network.provider, proxy)).toLowerCase();
+    const proxyCode = await hre.ethers.provider.getCode(proxy);
+    const implementationCode = await hre.ethers.provider.getCode(implementation);
+    if (!proxyCode || proxyCode === '0x')
+        throw new Error('UUPS proxy has no code');
+    if (!implementationCode || implementationCode === '0x')
+        throw new Error('current implementation has no code');
+    const checker = new BytecodeChecker(hre, {}, 'evm');
+    const local = await checker.getLocalBytecode(`${artifact.sourceName}:${artifact.contractName}`);
+    const comparison = checker.compareBytecode(implementationCode, local.bytecode, local.abi, local.immutableReferences);
+    if (!comparison.matches)
+        throw new Error(`implementation bytecode mismatch: ${comparison.reason}`);
+    // Upgraded events are NOT proof of implementation creation. The workflow stores
+    // its upgrade receipt separately; unknown deployment hashes remain absent.
+    let deploymentTxHash;
+    if (!options.skipTxHash && options.transactionHash) {
+        const receipt = await hre.ethers.provider.getTransactionReceipt(options.transactionHash);
+        if (receipt?.status === 1 && receipt.to === null && receipt.contractAddress
+            && receipt.contractAddress.toLowerCase() === implementation) {
+            deploymentTxHash = options.transactionHash.toLowerCase();
+        }
+    }
+    const layoutHash = hashStorageLayout(candidate.layout);
+    return { root, paths, chainId, proxy, implementation, artifact: artifactIdentity(artifact, 'evm'),
+        versionKey, layout: candidate.layout, layoutHash, ...(deploymentTxHash ? { deploymentTxHash } : {}) };
+};
+/** Pure merge, shared by legacy sync and the delivery multi-file journal. */
+export function mergeEvmManifestCandidate(current, candidate) {
+    const manifest = JSON.parse(JSON.stringify(current));
+    const { versionKey, proxy, implementation, layoutHash, deploymentTxHash } = candidate;
+    const existing = manifest.impls[versionKey];
+    if (existing && hashStorageLayout(existing.layout) !== layoutHash) {
+        throw new Error('registered implementation layout conflicts with compiled artifact');
+    }
+    const registeredProxy = manifest.proxies.find(entry => entry.address.toLowerCase() === proxy);
+    if (registeredProxy && registeredProxy.kind !== 'uups')
+        throw new Error('proxy is not registered as UUPS');
+    const addresses = [...new Set([
+            ...(existing ? [existing.address, ...(existing.allAddresses ?? [])] : []), implementation,
+        ].map(address => getAddress(address).toLowerCase()))];
+    manifest.impls[versionKey] = {
+        ...existing,
+        address: existing?.address ?? implementation,
+        layout: existing?.layout ?? candidate.layout,
+        ...(addresses.length > 1 ? { allAddresses: addresses } : {}),
+        ...(!existing?.txHash && (!existing || existing.address.toLowerCase() === implementation)
+            && deploymentTxHash ? { txHash: deploymentTxHash } : {}),
+    };
+    if (!registeredProxy)
+        manifest.proxies.push({ address: proxy, kind: 'uups' });
+    return manifest;
+}
+export const syncEvmManifest = async (options, dependencies = {}) => {
+    const candidate = await prepareEvmManifestCandidate(options, dependencies);
+    const { root, paths, chainId, proxy, implementation, versionKey, layoutHash } = candidate;
+    const transaction = await withManifestTransaction({
+        root,
+        manifestFile: paths.file,
+        fallbackFile: paths.fallbackFile,
+        operation: async ({ manifestFile, fallbackFile, writeManifestAtomic }) => {
+            const manifest = mergeEvmManifestCandidate(readManifest(manifestFile, fallbackFile), candidate);
+            if (fallbackFile !== manifestFile && fs.existsSync(fallbackFile))
+                fs.unlinkSync(fallbackFile);
+            writeManifestAtomic(Buffer.from(`${JSON.stringify(manifest, null, 2)}\n`));
+            const bytes = fs.readFileSync(manifestFile);
+            const verified = parseTargetManifest(bytes);
+            const entry = verified.impls[versionKey];
+            if (!entry || ![entry.address, ...(entry.allAddresses ?? [])].some(address => address.toLowerCase() === implementation)
+                || hashStorageLayout(entry.layout) !== layoutHash
+                || !verified.proxies.some(p => p.address.toLowerCase() === proxy && p.kind === 'uups')) {
+                throw new Error('target manifest registration post-condition failed');
+            }
+            return {
+                scheme: 'evm',
+                network: options.network,
+                target: options.target,
+                chainId: chainId.toString(),
+                proxy,
+                implementation,
+                artifact: candidate.artifact,
+                layoutHash,
+                manifestDigest: crypto.createHash('sha256').update(bytes).digest('hex'),
+                manifestFile,
+            };
+        },
+    });
+    return { ...transaction.value, manifestTransaction: transaction.report, syncReport: transaction.reportFile };
+};
+//# sourceMappingURL=evmManifestSync.js.map

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

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

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

@@ -1,9 +1,47 @@
-import type { GateToolPreparationPlanV1 } from './types.js';
+import type { GateToolArtifact } from './artifacts.js';
+import type { ContractFactory } from 'ethers';
+import type { DeployData } from '@openzeppelin/hardhat-upgrades/dist/utils/deploy-impl.js';
+import type { RegisteredTargetUpgradeState } from './manifest.js';
+import type { StorageLayout } from '@openzeppelin/upgrades-core';
+import type { GateToolNormalizedUupsUpgradeRequestV1 } from './types.js';
+import type { GateToolPreparationPlanV1, GateToolNormalizedPreparationRequestV1 } from './types.js';
 export interface GateToolPreparationHre {
     network: {
         name: string;
     };
     run(task: string, options?: Record<string, unknown>): Promise<unknown>;
 }
-export declare const prepareWorkflow: (hre: GateToolPreparationHre, rawRequest: unknown) => Promise<GateToolPreparationPlanV1>;
+/** Optional trusted adapter hooks over the detached artifacts actually used after compilation. */
+export interface GateToolPreparationValidation {
+    data(value: unknown): unknown;
+    artifact(name: string, artifact: GateToolArtifact): GateToolArtifact;
+    arguments(artifact: GateToolArtifact, method: string | null, args: unknown[]): void;
+    /** Owned same-fork contribution. Historical upgrades continue through the actual target manifest. */
+    sameForkBaseline?(input: {
+        request: GateToolNormalizedUupsUpgradeRequestV1;
+        currentImplementation: string;
+        chainId: number;
+    }): Promise<{
+        kind: 'same-fork';
+        oldLayout: StorageLayout;
+        digest: string;
+    } | undefined>;
+    /** Awaited owned-call observation; separate from the synchronous post-compile artifact port. */
+    deployData?(input: {
+        artifact: GateToolArtifact;
+        factory: ContractFactory;
+        data: DeployData;
+        request: GateToolNormalizedPreparationRequestV1;
+        options: Record<string, unknown>;
+        baseline?: ({
+            state: RegisteredTargetUpgradeState;
+        } | {
+            sameFork: NonNullable<Awaited<ReturnType<NonNullable<GateToolPreparationValidation['sameForkBaseline']>>>>;
+        }) & {
+            currentImplementation: string;
+            chainId: number;
+        };
+    }): Promise<void>;
+}
+export declare const prepareWorkflow: (hre: GateToolPreparationHre, rawRequest: unknown, validation?: GateToolPreparationValidation) => Promise<GateToolPreparationPlanV1>;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core/preparation/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,yBAAyB,EAE1B,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,eAAO,MAAM,eAAe,GAC1B,KAAK,sBAAsB,EAC3B,YAAY,OAAO,KAClB,OAAO,CAAC,yBAAyB,CAYnC,CAAC"}
+{"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,sCAAsC,EAAE,MAAM,YAAY,CAAC;AAIzE,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,sCAAsC,CAAC;QAAC,qBAAqB,EAAC,MAAM,CAAC;QAAC,OAAO,EAAC,MAAM,CAAA;KAAC,GAAG,OAAO,CAAC;QACjI,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,CAYnC,CAAC"}

package/dist/core/preparation/index.js

@@ -1,14 +1,14 @@
 import { prepareEvm } from './evm.js';
 import { prepareZkSync } from './zksync.js';
 import { normalizePreparationRequest } from './normalize.js';
-export const prepareWorkflow = async (hre, rawRequest) => {
-    const request = normalizePreparationRequest(rawRequest);
+export const prepareWorkflow = async (hre, rawRequest, validation) => {
+    const request = normalizePreparationRequest(validation ? validation.data(rawRequest) : rawRequest);
     if (hre.network.name !== request.network) {
         throw new Error(`preparation request network ${request.network} does not match Hardhat network ${hre.network.name}`);
     }
     await hre.run('compile', { quiet: true });
     if (request.scheme === 'evm') {
-        return prepareEvm(hre, request);
+        return prepareEvm(hre, request, { validation });
     }
     return prepareZkSync(hre, request);
 };

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/preparation/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,2BAA2B,EAAE,MAAM,gBAAgB,CAAC;AAW7D,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAClC,GAA2B,EAC3B,UAAmB,EACiB,EAAE;IACtC,MAAM,OAAO,GAA2C,2BAA2B,CAAC,UAAU,CAAC,CAAC;IAChG,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,IAAI,OAAO,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;QAC7B,OAAO,UAAU,CAAC,GAAkD,EAAE,OAAO,CAAC,CAAC;IACjF,CAAC;IACD,OAAO,aAAa,CAAC,GAAqD,EAAE,OAAO,CAAC,CAAC;AACvF,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/preparation/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,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,IAAI,OAAO,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;QAC7B,OAAO,UAAU,CAAC,GAAkD,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;IACjG,CAAC;IACD,OAAO,aAAa,CAAC,GAAqD,EAAE,OAAO,CAAC,CAAC;AACvF,CAAC,CAAC"}

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

@@ -21,23 +21,35 @@ export interface TargetManifestData {
     }>;
     admin?: unknown;
 }
-export interface RegisteredZkUpgradeState {
+export interface RegisteredTargetUpgradeState {
     manifest: TargetManifestData;
     paths: TargetManifestPaths;
     bytes: Buffer;
     digest: string;
     oldLayout: StorageLayout;
+    proxyEntry: TargetManifestData['proxies'][number];
+    implementationKey: string;
+    implementationEntry: NonNullable<TargetManifestData['impls'][string]>;
 }
 export declare const resolveTargetManifestDirectory: (root: string, target: string, env?: NodeJS.ProcessEnv) => string;
 export declare const resolveTargetManifestPaths: (root: string, target: string, chainId: number, env?: NodeJS.ProcessEnv) => TargetManifestPaths;
 export declare const parseTargetManifest: (bytes: Buffer) => TargetManifestData;
-export declare const readRegisteredZkUpgradeState: (input: {
+export declare const readRegisteredTargetUpgradeState: (input: {
     root: string;
     target: string;
     chainId: number;
     proxy: string;
     currentImplementation: string;
     env?: NodeJS.ProcessEnv;
-}) => RegisteredZkUpgradeState;
+}) => RegisteredTargetUpgradeState;
 export declare const hashStorageLayout: (layout: StorageLayout) => string;
+export type RegisteredZkUpgradeState = RegisteredTargetUpgradeState;
+export declare const readRegisteredZkUpgradeState: (input: {
+    root: string;
+    target: string;
+    chainId: number;
+    proxy: string;
+    currentImplementation: string;
+    env?: NodeJS.ProcessEnv;
+}) => RegisteredTargetUpgradeState;
 //# sourceMappingURL=manifest.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../../../src/core/preparation/manifest.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgB,KAAK,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAa/E,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,kBAAkB;IACjC,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE;QACpB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;QACxB,MAAM,EAAE,aAAa,CAAC;KACvB,GAAG,SAAS,CAAC,CAAC;IACf,OAAO,EAAE,KAAK,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,MAAM,GAAG,aAAa,GAAG,QAAQ,CAAC;KACzC,CAAC,CAAC;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,wBAAwB;IACvC,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,KAAK,EAAE,mBAAmB,CAAC;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,aAAa,CAAC;CAC1B;AA8BD,eAAO,MAAM,8BAA8B,GACzC,MAAM,MAAM,EACZ,QAAQ,MAAM,EACd,MAAK,MAAM,CAAC,UAAwB,KACnC,MA2CF,CAAC;AAEF,eAAO,MAAM,0BAA0B,GACrC,MAAM,MAAM,EACZ,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,MAAK,MAAM,CAAC,UAAwB,KACnC,mBAgBF,CAAC;AAeF,eAAO,MAAM,mBAAmB,GAAI,OAAO,MAAM,KAAG,kBAsBnD,CAAC;AAeF,eAAO,MAAM,4BAA4B,GAAI,OAAO;IAClD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,qBAAqB,EAAE,MAAM,CAAC;IAC9B,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACzB,KAAG,wBA2BH,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,QAAQ,aAAa,KAAG,MAG1C,CAAC"}
+{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../../../src/core/preparation/manifest.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgB,KAAK,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAY/E,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,kBAAkB;IACjC,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE;QACpB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;QACxB,MAAM,EAAE,aAAa,CAAC;KACvB,GAAG,SAAS,CAAC,CAAC;IACf,OAAO,EAAE,KAAK,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,MAAM,GAAG,aAAa,GAAG,QAAQ,CAAC;KACzC,CAAC,CAAC;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,KAAK,EAAE,mBAAmB,CAAC;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,aAAa,CAAC;IACzB,UAAU,EAAE,kBAAkB,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC;IAClD,iBAAiB,EAAE,MAAM,CAAC;IAC1B,mBAAmB,EAAE,WAAW,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;CACvE;AA8BD,eAAO,MAAM,8BAA8B,GACzC,MAAM,MAAM,EACZ,QAAQ,MAAM,EACd,MAAK,MAAM,CAAC,UAAwB,KACnC,MA6BF,CAAC;AAEF,eAAO,MAAM,0BAA0B,GACrC,MAAM,MAAM,EACZ,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,MAAK,MAAM,CAAC,UAAwB,KACnC,mBAgBF,CAAC;AAeF,eAAO,MAAM,mBAAmB,GAAI,OAAO,MAAM,KAAG,kBAsBnD,CAAC;AAiBF,eAAO,MAAM,gCAAgC,GAAI,OAAO;IACtD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,qBAAqB,EAAE,MAAM,CAAC;IAC9B,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACzB,KAAG,4BAgCH,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,QAAQ,aAAa,KAAG,MAG1C,CAAC;AAGjB,MAAM,MAAM,wBAAwB,GAAG,4BAA4B,CAAC;AACpE,eAAO,MAAM,4BAA4B,UAhDe;IACtD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,qBAAqB,EAAE,MAAM,CAAC;IAC9B,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACzB,KAAG,4BAyCwE,CAAC"}

package/dist/core/preparation/manifest.js

@@ -3,10 +3,9 @@ import fs from 'node:fs';
 import path from 'node:path';
 import YAML from 'yaml';
 import { networkNames } from '@openzeppelin/upgrades-core';
+import { validateManifestPolicy, validateNetworkAlias } from '../../delivery/policy.js';
 import { canonicalPreparationJson } from './normalize.js';
-const SAFE_TARGET = /^[A-Za-z0-9][A-Za-z0-9_-]{0,199}$/;
 const SAFE_MANIFEST_DIR = /^\.openzeppelin(?:\.[a-z0-9][a-z0-9-]*)?$/;
-const ENVIRONMENTS = new Set(['local', 'development', 'production']);
 const regularFile = (filePath, label) => {
     if (!fs.existsSync(filePath))
         throw new Error(`${label} is missing: ${filePath}`);
@@ -37,9 +36,7 @@ const assertManifestDirectory = (root, manifestDir) => {
     return candidate;
 };
 export const resolveTargetManifestDirectory = (root, target, env = process.env) => {
-    if (!SAFE_TARGET.test(target) || target.startsWith('_')) {
-        throw new Error(`invalid manifest target: ${target}`);
-    }
+    validateNetworkAlias(target, 'manifest target');
     const resolvedRoot = path.resolve(root);
     const configFile = path.join(resolvedRoot, 'config.yaml');
     regularFile(configFile, 'config.yaml');
@@ -52,19 +49,7 @@ export const resolveTargetManifestDirectory = (root, target, env = process.env)
         throw new Error(`config.yaml has no target ${target}`);
     }
     const config = selected;
-    if (!ENVIRONMENTS.has(String(config.environment))) {
-        throw new Error(`config.yaml target ${target} has an invalid environment`);
-    }
-    const manifestDir = config.openzeppelin?.manifestDir;
-    if (typeof manifestDir !== 'string') {
-        throw new Error(`config.yaml target ${target} must define openzeppelin.manifestDir`);
-    }
-    if (config.environment === 'production' && manifestDir !== '.openzeppelin') {
-        throw new Error(`production target ${target} must use .openzeppelin`);
-    }
-    if (config.environment !== 'production' && manifestDir === '.openzeppelin') {
-        throw new Error(`non-production target ${target} must not use .openzeppelin`);
-    }
+    const manifestDir = validateManifestPolicy(config.environment, config.openzeppelin?.manifestDir);
     assertManifestDirectory(resolvedRoot, manifestDir);
     const configuredEnvironment = env.MANIFEST_DEFAULT_DIR?.trim();
     if (configuredEnvironment && configuredEnvironment !== manifestDir) {
@@ -132,26 +117,32 @@ export const parseTargetManifest = (bytes) => {
 };
 const matchingImplementation = (manifest, implementation) => {
     const expected = implementation.toLowerCase();
-    for (const entry of Object.values(manifest.impls)) {
+    const matches = [];
+    for (const [key, entry] of Object.entries(manifest.impls)) {
         if (!entry)
             continue;
         const addresses = [entry.address, ...(entry.allAddresses ?? [])];
         if (addresses.some((address) => address.toLowerCase() === expected))
-            return entry.layout;
+            matches.push([key, entry]);
     }
-    return undefined;
+    if (matches.length > 1)
+        throw new Error('Ambiguous implementation entries in target manifest');
+    return matches[0];
 };
-export const readRegisteredZkUpgradeState = (input) => {
+export const readRegisteredTargetUpgradeState = (input) => {
     const paths = resolveTargetManifestPaths(input.root, input.target, input.chainId, input.env);
     const bytes = readManifestBytes(paths);
     const manifest = parseTargetManifest(bytes);
-    const proxyEntry = manifest.proxies.find((entry) => entry.address.toLowerCase() === input.proxy.toLowerCase());
+    const proxyEntries = manifest.proxies.filter((entry) => entry.address.toLowerCase() === input.proxy.toLowerCase());
+    if (proxyEntries.length > 1)
+        throw new Error('Ambiguous proxy entries in target manifest');
+    const proxyEntry = proxyEntries[0];
     if (!proxyEntry)
         throw new Error(`proxy ${input.proxy} is not registered in the target manifest`);
     if (proxyEntry.kind !== 'uups')
         throw new Error(`proxy ${input.proxy} is not registered as UUPS`);
-    const oldLayout = matchingImplementation(manifest, input.currentImplementation);
-    if (!oldLayout) {
+    const implementation = matchingImplementation(manifest, input.currentImplementation);
+    if (!implementation) {
         throw new Error(`current implementation ${input.currentImplementation} is not registered in the target manifest`);
     }
     return {
@@ -159,11 +150,15 @@ export const readRegisteredZkUpgradeState = (input) => {
         paths,
         bytes,
         digest: crypto.createHash('sha256').update(bytes).digest('hex'),
-        oldLayout,
+        oldLayout: implementation[1].layout,
+        proxyEntry,
+        implementationKey: implementation[0],
+        implementationEntry: implementation[1],
     };
 };
 export const hashStorageLayout = (layout) => crypto
     .createHash('sha256')
     .update(canonicalPreparationJson(layout))
     .digest('hex');
+export const readRegisteredZkUpgradeState = readRegisteredTargetUpgradeState;
 //# sourceMappingURL=manifest.js.map

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"normalize.d.ts","sourceRoot":"","sources":["../../../src/core/preparation/normalize.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAOV,yBAAyB,EACzB,sCAAsC,EAKvC,MAAM,YAAY,CAAC;AAmLpB,eAAO,MAAM,2BAA2B,GACtC,KAAK,OAAO,KACX,sCA+EF,CAAC;AAaF,eAAO,MAAM,wBAAwB,GAAI,KAAK,OAAO,KAAG,MAEvD,CAAC;AAEF,eAAO,MAAM,sBAAsB,GAAI,KAAK,OAAO,KAAG,MAGrD,CAAC;AA2MF,eAAO,MAAM,wBAAwB,GAAI,KAAK,OAAO,KAAG,yBA2CvD,CAAC;AAkBF,eAAO,MAAM,0BAA0B,GACrC,UAAU,MAAM,EAChB,KAAK,OAAO,EACZ,aAAoB,KACnB,yBAaF,CAAC"}
+{"version":3,"file":"normalize.d.ts","sourceRoot":"","sources":["../../../src/core/preparation/normalize.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAOV,yBAAyB,EACzB,sCAAsC,EAKvC,MAAM,YAAY,CAAC;AAmLpB,eAAO,MAAM,2BAA2B,GACtC,KAAK,OAAO,KACX,sCA+EF,CAAC;AAaF,eAAO,MAAM,wBAAwB,GAAI,KAAK,OAAO,KAAG,MAEvD,CAAC;AAEF,eAAO,MAAM,sBAAsB,GAAI,KAAK,OAAO,KAAG,MAGrD,CAAC;AA8MF,eAAO,MAAM,wBAAwB,GAAI,KAAK,OAAO,KAAG,yBA2CvD,CAAC;AAkBF,eAAO,MAAM,0BAA0B,GACrC,UAAU,MAAM,EAChB,KAAK,OAAO,EACZ,aAAoB,KACnB,yBAaF,CAAC"}

package/dist/core/preparation/normalize.js

@@ -1,3 +1,4 @@
+import { validateNetworkAlias } from '../../delivery/policy.js';
 import crypto from 'node:crypto';
 import fs from 'node:fs';
 import path from 'node:path';
@@ -90,7 +91,7 @@ const canonicalValue = (raw, label) => {
     }
     if (raw && typeof raw === 'object') {
         const value = raw;
-        const result = {};
+        const result = Object.create(null);
         for (const key of Object.keys(value).sort()) {
             if (value[key] === undefined)
                 throw new Error(`${label}.${key} must be JSON-safe`);
@@ -180,8 +181,8 @@ export const normalizePreparationRequest = (raw) => {
     const common = {
         version: 1,
         scheme: scheme(value.scheme),
-        network: safeId(value.network, 'network'),
-        target: safeId(value.target, 'target'),
+        network: validateNetworkAlias(value.network, 'network'),
+        target: validateNetworkAlias(value.target, 'target'),
         contract: nonEmptyString(value.contract, 'contract'),
         constructorArgs: canonicalArray(value.constructorArgs, 'constructorArgs'),
         factory: address(value.factory, 'factory'),
@@ -237,7 +238,7 @@ const canonicalJsonValue = (raw) => {
         return raw.map(canonicalJsonValue);
     if (raw && typeof raw === 'object') {
         const value = raw;
-        const result = {};
+        const result = Object.create(null);
         for (const key of Object.keys(value).sort())
             result[key] = canonicalJsonValue(value[key]);
         return result;
@@ -296,8 +297,11 @@ const normalizeValidation = (raw, selectedKind, selectedScheme) => {
     }
     exactKeys(value, [
         'kind', 'engine', 'artifactFormat', 'implementationSafe', 'storageLayoutCompatible',
-        'currentImplementation', 'oldLayoutHash', 'newLayoutHash', 'manifestDigest',
-    ], [], 'validation');
+        'currentImplementation', 'oldLayoutHash', 'newLayoutHash',
+    ], ['manifestDigest', 'sameForkBaselineDigest'], 'validation');
+    if (Object.hasOwn(value, 'manifestDigest') === Object.hasOwn(value, 'sameForkBaselineDigest')
+        || (Object.hasOwn(value, 'sameForkBaselineDigest') && selectedScheme !== 'evm'))
+        throw new Error('Upgrade validation requires exactly one supported baseline kind');
     if (value.kind !== 'uups-upgrade'
         || value.engine !== expectedEngine
         || value.implementationSafe !== true
@@ -313,7 +317,8 @@ const normalizeValidation = (raw, selectedKind, selectedScheme) => {
         currentImplementation: address(value.currentImplementation, 'validation.currentImplementation'),
         oldLayoutHash: digest(value.oldLayoutHash, 'validation.oldLayoutHash'),
         newLayoutHash: digest(value.newLayoutHash, 'validation.newLayoutHash'),
-        manifestDigest: digest(value.manifestDigest, 'validation.manifestDigest'),
+        ...(Object.hasOwn(value, 'manifestDigest') ? { manifestDigest: digest(value.manifestDigest, 'validation.manifestDigest') }
+            : { sameForkBaselineDigest: digest(value.sameForkBaselineDigest, 'validation.sameForkBaselineDigest') }),
     };
 };
 const normalizeDeployment = (raw, index, selectedScheme) => {
@@ -451,8 +456,8 @@ export const normalizePreparationPlan = (raw) => {
         requestHash: digest(value.requestHash, 'requestHash'),
         kind: selectedKind,
         scheme: selectedScheme,
-        network: safeId(value.network, 'network'),
-        target: safeId(value.target, 'target'),
+        network: validateNetworkAlias(value.network, 'network'),
+        target: validateNetworkAlias(value.target, 'target'),
         chainId: integerString(value.chainId, 'chainId'),
         contract: nonEmptyString(value.contract, 'contract'),
         ...(selectedKind === 'create2-deploy' ? {} : { proxyKind: 'uups' }),