gate-evm-tools 1.0.31 → 1.2.1

package/dist-cjs/core/preparation/batch.js

@@ -0,0 +1,76 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.prepareControlledMulticallTransaction = void 0;
+const ethers_1 = require("ethers");
+const CONTROLLED_MULTICALL_INTERFACE = new ethers_1.Interface([
+    "function aggregate3(tuple(address target,bool allowFailure,bytes callData)[] calls) payable returns (tuple(bool success, bytes returnData)[] returnData)",
+    "function aggregate3Value(tuple(address target,bool allowFailure,uint256 value,bytes callData)[] calls) payable returns (tuple(bool success, bytes returnData)[] returnData)",
+]);
+const bigintValue = (value) => {
+    if (typeof value !== "string" || value.trim() === "")
+        throw new Error("transaction value must be explicit");
+    if (value === "0")
+        return 0n;
+    const parsed = BigInt(value);
+    if (parsed < 0n)
+        throw new Error("transaction value must be nonnegative");
+    return parsed;
+};
+const normalizeFactoryDeps = (input, label) => {
+    const seen = new Set();
+    const output = [];
+    for (const [index, dependency] of input.entries()) {
+        if (!/^0x(?:[0-9a-fA-F]{2})+$/.test(dependency)) {
+            throw new Error(`${label}[${index}] must be non-empty byte-aligned bytecode`);
+        }
+        const normalized = dependency.toLowerCase();
+        if (seen.has(normalized))
+            continue;
+        seen.add(normalized);
+        output.push(normalized);
+    }
+    return output;
+};
+const prepareControlledMulticallTransaction = (controlledMulticall, inputCalls, scheme = "evm") => {
+    if (scheme !== "evm" && scheme !== "zksync-eravm")
+        throw new Error("scheme must be evm or zksync-eravm");
+    if (!(0, ethers_1.isAddress)(controlledMulticall)) {
+        throw new Error("controlledMulticall must be an EVM address");
+    }
+    if (inputCalls.length === 0) {
+        throw new Error("controlled multicall requires at least one inner call");
+    }
+    if (scheme === "evm" && inputCalls.some((call) => call.factoryDeps !== undefined)) {
+        throw new Error("factoryDeps are only supported for zkSync transactions");
+    }
+    if (scheme === "zksync-eravm" && inputCalls.some((call) => call.factoryDeps === undefined)) {
+        throw new Error("every zkSync GateTool call must include factoryDeps");
+    }
+    const calls = inputCalls.map((call) => ({
+        target: (0, ethers_1.getAddress)(call.target),
+        allowFailure: false,
+        value: bigintValue(call.value).toString(10),
+        callData: call.data,
+    }));
+    const totalValue = calls.reduce((sum, call) => sum + BigInt(call.value), 0n);
+    const method = totalValue === 0n ? "aggregate3" : "aggregate3Value";
+    const encodedCalls = method === "aggregate3"
+        ? calls.map(({ value: _value, ...call }) => call)
+        : calls;
+    const factoryDeps = scheme === "zksync-eravm"
+        ? normalizeFactoryDeps(inputCalls.flatMap((call) => call.factoryDeps), "factoryDeps")
+        : undefined;
+    return {
+        target: (0, ethers_1.getAddress)(controlledMulticall),
+        value: totalValue.toString(10),
+        data: CONTROLLED_MULTICALL_INTERFACE.encodeFunctionData(method, [encodedCalls]),
+        operation: 0,
+        method,
+        calls,
+        ...(scheme === "zksync-eravm"
+            ? { scheme: "zksync-eravm", factoryDeps: factoryDeps }
+            : {}),
+    };
+};
+exports.prepareControlledMulticallTransaction = prepareControlledMulticallTransaction;
+//# sourceMappingURL=batch.js.map

package/dist-cjs/core/preparation/batch.js.map

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

package/dist-cjs/core/preparation/evm.js

@@ -3,13 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareEvm = exports.resolveTargetManifestEvidence = void 0;
+exports.prepareEvm = exports.buildDeployment = exports.validateUpgradeAndLoadDefaultEvidence = exports.resolveTargetManifestEvidence = void 0;
+const transparent_js_1 = require("./transparent.js");
 const ethers_1 = require("ethers");
 const node_crypto_1 = __importDefault(require("node:crypto"));
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const deploy_impl_js_1 = require("@openzeppelin/hardhat-upgrades/dist/utils/deploy-impl.js");
 const upgrades_core_1 = require("@openzeppelin/upgrades-core");
+const BytecodeChecker_js_1 = require("../BytecodeChecker.js");
 const artifacts_js_1 = require("./artifacts.js");
 const normalize_js_1 = require("./normalize.js");
 const manifest_js_1 = require("./manifest.js");
@@ -93,6 +95,7 @@ const validateUpgradeAndLoadDefaultEvidence = async (hre, request, factory, vali
         chainId,
         proxy: request.proxy,
         currentImplementation,
+        proxyKind: request.proxyKind,
     });
     const oldLayout = sameFork?.oldLayout ?? manifestEvidence.oldLayout;
     (0, upgrades_core_1.assertUpgradeSafe)(deployData.validations, deployData.version, deployData.fullOpts);
@@ -106,6 +109,7 @@ const validateUpgradeAndLoadDefaultEvidence = async (hre, request, factory, vali
         ...(sameFork ? { sameForkBaselineDigest: sameFork.digest } : { manifestDigest: manifestEvidence.digest }),
     };
 };
+exports.validateUpgradeAndLoadDefaultEvidence = validateUpgradeAndLoadDefaultEvidence;
 const assertAddressPolicy = (predictedAddress, policy, label) => {
     if (!policy)
         return;
@@ -137,8 +141,19 @@ const buildDeployment = async (input) => {
         constructorInput,
         initCodeHash,
     };
-    if (status === 'reused')
+    if (status === 'reused') {
+        // Existence alone is not identity. Reuse must match compiled runtime; compiler
+        // immutable offsets are the only permitted runtime substitution evidence.
+        const checker = new BytecodeChecker_js_1.BytecodeChecker(input.hre, {}, 'evm');
+        const local = await checker.getLocalBytecode(`${input.artifact.sourceName}:${input.artifact.contractName}`);
+        if (!input.artifact.deployedBytecode || input.artifact.deployedBytecode === '0x') {
+            throw new Error(`${input.role} reuse requires compiled runtime bytecode`);
+        }
+        const comparison = checker.compareBytecode(code, input.artifact.deployedBytecode, null, local.immutableReferences);
+        if (!comparison.matches)
+            throw new Error(`${input.role} reused runtime bytecode mismatch at ${predictedAddress}: ${comparison.reason}`);
         return { deployment, initCode, factory };
+    }
     const purpose = input.role === 'contract'
         ? 'deploy-contract'
         : input.role === 'implementation'
@@ -164,8 +179,9 @@ const buildDeployment = async (input) => {
         },
     };
 };
+exports.buildDeployment = buildDeployment;
 const preparePlain = async (hre, request, artifact, dependencies) => {
-    const prepared = await buildDeployment({
+    const prepared = await (0, exports.buildDeployment)({
         hre,
         validation: dependencies.validation,
         role: 'contract',
@@ -229,7 +245,7 @@ const prepareUupsInitial = async (hre, request, artifact, dependencies) => {
     }
     else
         await validateImplementation(implementationFactory, validationOptions);
-    const implementation = await buildDeployment({
+    const implementation = await (0, exports.buildDeployment)({
         hre,
         validation: dependencies.validation,
         role: 'implementation',
@@ -240,7 +256,7 @@ const prepareUupsInitial = async (hre, request, artifact, dependencies) => {
     });
     const rawProxyArtifact = await hre.artifacts.readArtifact(ERC1967_PROXY_ARTIFACT);
     const proxyArtifact = dependencies.validation?.artifact(ERC1967_PROXY_ARTIFACT, rawProxyArtifact) ?? rawProxyArtifact;
-    const proxy = await buildDeployment({
+    const proxy = await (0, exports.buildDeployment)({
         hre,
         validation: dependencies.validation,
         role: 'proxy',
@@ -313,8 +329,8 @@ const prepareUupsUpgrade = async (hre, request, artifact, dependencies) => {
     };
     if (request.unsafeAllow)
         validationOptions.unsafeAllow = request.unsafeAllow;
-    const evidence = await (dependencies.loadUpgradeEvidence ?? validateUpgradeAndLoadDefaultEvidence)(hre, request, implementationFactory, validationOptions, { validation: dependencies.validation, artifact });
-    const implementation = await buildDeployment({
+    const evidence = await (dependencies.loadUpgradeEvidence ?? exports.validateUpgradeAndLoadDefaultEvidence)(hre, request, implementationFactory, validationOptions, { validation: dependencies.validation, artifact });
+    const implementation = await (0, exports.buildDeployment)({
         hre,
         validation: dependencies.validation,
         role: 'implementation',
@@ -376,6 +392,8 @@ const prepareEvm = async (hre, request, dependencies = {}) => {
     (0, artifacts_js_1.assertArtifactScheme)(artifact, 'evm');
     if (request.kind === 'create2-deploy')
         return preparePlain(hre, request, artifact, dependencies);
+    if (request.kind === 'transparent-deploy' || request.kind === 'transparent-upgrade')
+        return (0, transparent_js_1.prepareTransparent)(hre, request, artifact, dependencies);
     if (request.kind === 'uups-placeholder-deploy') {
         return prepareUupsInitial(hre, request, artifact, dependencies);
     }

package/dist-cjs/core/preparation/evm.js.map

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

package/dist-cjs/core/preparation/evmManifestSync.js

@@ -11,6 +11,7 @@ const node_path_1 = __importDefault(require("node:path"));
 const ethers_1 = require("ethers");
 const deploy_impl_js_1 = require("@openzeppelin/hardhat-upgrades/dist/utils/deploy-impl.js");
 const upgrades_core_1 = require("@openzeppelin/upgrades-core");
+const transparent_js_1 = require("./transparent.js");
 const BytecodeChecker_js_1 = require("../BytecodeChecker.js");
 const artifacts_js_1 = require("./artifacts.js");
 const manifest_js_1 = require("./manifest.js");
@@ -32,6 +33,8 @@ const prepareEvmManifestCandidate = async (options, dependencies = {}) => {
         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');
+    if (options.proxyKind !== undefined && !['uups', 'transparent'].includes(options.proxyKind))
+        throw new Error('sync proxyKind must be uups or transparent');
     const root = node_path_1.default.resolve(options.root ?? hre.config.paths.root);
     if (root !== node_path_1.default.resolve(hre.config.paths.root))
         throw new Error('sync root does not match the Hardhat project root');
@@ -52,7 +55,7 @@ const prepareEvmManifestCandidate = async (options, dependencies = {}) => {
     (0, artifacts_js_1.assertArtifactScheme)(artifact, 'evm');
     const factory = new ethers_1.ContractFactory(artifact.abi, artifact.bytecode);
     const candidate = await (dependencies.loadCandidate ?? deploy_impl_js_1.getDeployData)(hre, factory, {
-        kind: 'uups',
+        kind: options.proxyKind ?? 'uups',
         constructorArgs: options.constructorArgs ?? [],
         ...(options.unsafeAllow ? { unsafeAllow: options.unsafeAllow } : {}),
     });
@@ -66,7 +69,7 @@ const prepareEvmManifestCandidate = async (options, dependencies = {}) => {
     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');
+        throw new Error('proxy has no code');
     if (!implementationCode || implementationCode === '0x')
         throw new Error('current implementation has no code');
     const checker = new BytecodeChecker_js_1.BytecodeChecker(hre, {}, 'evm');
@@ -84,8 +87,13 @@ const prepareEvmManifestCandidate = async (options, dependencies = {}) => {
             deploymentTxHash = options.transactionHash.toLowerCase();
         }
     }
+    if (options.proxyKind === 'transparent') {
+        if (!options.proxyAdminAddress || !options.proxyAdminOwner)
+            throw Error('Transparent sync requires explicit ProxyAdmin address/owner');
+        await (0, transparent_js_1.verifyTransparentAdmin)({ hre: hre, proxy, admin: options.proxyAdminAddress, owner: options.proxyAdminOwner });
+    }
     const layoutHash = (0, manifest_js_1.hashStorageLayout)(candidate.layout);
-    return { root, paths, chainId, proxy, implementation, artifact: (0, artifacts_js_1.artifactIdentity)(artifact, 'evm'),
+    return { root, paths, chainId, proxy, proxyKind: options.proxyKind ?? 'uups', implementation, artifact: (0, artifacts_js_1.artifactIdentity)(artifact, 'evm'),
         versionKey, layout: candidate.layout, layoutHash, ...(deploymentTxHash ? { deploymentTxHash } : {}) };
 };
 exports.prepareEvmManifestCandidate = prepareEvmManifestCandidate;
@@ -98,8 +106,8 @@ function mergeEvmManifestCandidate(current, candidate) {
         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');
+    if (registeredProxy && registeredProxy.kind !== (candidate.proxyKind ?? 'uups'))
+        throw new Error('registered proxy kind differs from requested kind');
     const addresses = [...new Set([
             ...(existing ? [existing.address, ...(existing.allAddresses ?? [])] : []), implementation,
         ].map(address => (0, ethers_1.getAddress)(address).toLowerCase()))];
@@ -112,7 +120,7 @@ function mergeEvmManifestCandidate(current, candidate) {
             && deploymentTxHash ? { txHash: deploymentTxHash } : {}),
     };
     if (!registeredProxy)
-        manifest.proxies.push({ address: proxy, kind: 'uups' });
+        manifest.proxies.push({ address: proxy, kind: candidate.proxyKind ?? 'uups' });
     return manifest;
 }
 const syncEvmManifest = async (options, dependencies = {}) => {
@@ -132,7 +140,7 @@ const syncEvmManifest = async (options, dependencies = {}) => {
             const entry = verified.impls[versionKey];
             if (!entry || ![entry.address, ...(entry.allAddresses ?? [])].some(address => address.toLowerCase() === implementation)
                 || (0, manifest_js_1.hashStorageLayout)(entry.layout) !== layoutHash
-                || !verified.proxies.some(p => p.address.toLowerCase() === proxy && p.kind === 'uups')) {
+                || !verified.proxies.some(p => p.address.toLowerCase() === proxy && p.kind === candidate.proxyKind)) {
                 throw new Error('target manifest registration post-condition failed');
             }
             return {

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

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

package/dist-cjs/core/preparation/manifest.js

@@ -148,8 +148,8 @@ const readRegisteredTargetUpgradeState = (input) => {
     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`);
+    if (proxyEntry.kind !== (input.proxyKind ?? 'uups'))
+        throw new Error(`proxy ${input.proxy} is not registered as ${input.proxyKind ?? 'UUPS'}`);
     const implementation = matchingImplementation(manifest, input.currentImplementation);
     if (!implementation) {
         throw new Error(`current implementation ${input.currentImplementation} is not registered in the target manifest`);

package/dist-cjs/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-cjs/core/preparation/normalize.js

@@ -122,7 +122,9 @@ const scheme = (raw) => {
 const kind = (raw) => {
     if (raw !== 'create2-deploy'
         && raw !== 'uups-placeholder-deploy'
-        && raw !== 'uups-upgrade') {
+        && raw !== 'uups-upgrade'
+        && raw !== 'transparent-deploy'
+        && raw !== 'transparent-upgrade') {
         throw new Error('preparation kind is invalid');
     }
     return raw;
@@ -162,6 +164,9 @@ const unsafeAllow = (raw) => {
 };
 const normalizePreparationRequest = (raw) => {
     const value = record(raw, 'preparation request');
+    if ('create2Factory' in value || 'postDeployCalls' in value || 'transferOwnership' in value) {
+        throw new Error('OpenZeppelin private deployment options are unsupported; use prepareWorkflow and explicit planned calls');
+    }
     const selectedKind = kind(value.kind);
     const commonRequired = [
         'version', 'kind', 'network', 'target', 'contract', 'constructorArgs', 'factory',
@@ -172,6 +177,10 @@ const normalizePreparationRequest = (raw) => {
             ...commonOptional, 'create2ForwardValue', 'callForwardValue', 'addressPolicy',
         ], 'preparation request');
     }
+    else if (selectedKind === 'transparent-deploy' || selectedKind === 'transparent-upgrade') {
+        exactKeys(value, [...commonRequired, 'proxyKind', 'implementationSalt', 'proxyAdminOwner',
+            ...(selectedKind === 'transparent-deploy' ? ['proxySalt'] : ['proxy', 'proxyAdmin'])], [...commonOptional, 'unsafeAllow', 'call', selectedKind === 'transparent-deploy' ? 'proxyAddressPolicy' : 'implementationAddressPolicy'], 'preparation request');
+    }
     else if (selectedKind === 'uups-placeholder-deploy') {
         exactKeys(value, [
             ...commonRequired, 'proxyKind', 'implementationSalt', 'proxySalt', 'placeholderImplementation',
@@ -209,6 +218,22 @@ const normalizePreparationRequest = (raw) => {
             }),
         };
     }
+    if (selectedKind === 'transparent-deploy' || selectedKind === 'transparent-upgrade') {
+        if (value.proxyKind !== 'transparent')
+            throw new Error('proxyKind must be transparent');
+        if (common.scheme !== 'evm')
+            throw new Error('Transparent preparation requires ordinary EVM');
+        const transparent = { ...common, scheme: 'evm', proxyKind: 'transparent',
+            implementationSalt: salt(value.implementationSalt, 'implementationSalt'),
+            proxyAdminOwner: address(value.proxyAdminOwner, 'proxyAdminOwner'),
+            ...(value.unsafeAllow === undefined ? {} : { unsafeAllow: unsafeAllow(value.unsafeAllow) }),
+            ...(value.call === undefined ? {} : { call: call(value.call, 'call') }) };
+        return selectedKind === 'transparent-deploy' ? { ...transparent, kind: selectedKind,
+            proxySalt: salt(value.proxySalt, 'proxySalt'),
+            ...(value.proxyAddressPolicy === undefined ? {} : { proxyAddressPolicy: addressPolicy(value.proxyAddressPolicy, 'proxyAddressPolicy') }) }
+            : { ...transparent, kind: selectedKind, proxy: address(value.proxy, 'proxy'), proxyAdmin: address(value.proxyAdmin, 'proxyAdmin'),
+                ...(value.implementationAddressPolicy === undefined ? {} : { implementationAddressPolicy: addressPolicy(value.implementationAddressPolicy, 'implementationAddressPolicy') }) };
+    }
     if (value.proxyKind !== 'uups')
         throw new Error('proxyKind must be uups');
     const uups = {
@@ -289,16 +314,19 @@ const normalizeValidation = (raw, selectedKind, selectedScheme) => {
         }
         return { kind: 'artifact', engine: 'hardhat-artifact', artifactFormat: format };
     }
+    if (selectedKind.startsWith('transparent-') && selectedScheme !== 'evm')
+        throw new Error('Transparent preparation requires ordinary EVM');
     const expectedEngine = selectedScheme === 'evm' ? 'openzeppelin' : 'matterlabs-openzeppelin';
-    if (selectedKind === 'uups-placeholder-deploy') {
+    if (selectedKind === 'uups-placeholder-deploy' || selectedKind === 'transparent-deploy') {
+        const initialKind = selectedKind === 'transparent-deploy' ? 'transparent-initial' : 'uups-initial';
         exactKeys(value, ['kind', 'engine', 'artifactFormat', 'implementationSafe'], [], 'validation');
-        if (value.kind !== 'uups-initial'
+        if (value.kind !== initialKind
             || value.engine !== expectedEngine
             || value.implementationSafe !== true) {
             throw new Error('uups-placeholder-deploy requires implementation safety validation');
         }
         return {
-            kind: 'uups-initial',
+            kind: initialKind,
             engine: expectedEngine,
             artifactFormat: format,
             implementationSafe: true,
@@ -311,14 +339,14 @@ const normalizeValidation = (raw, selectedKind, selectedScheme) => {
     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'
+    if (value.kind !== selectedKind
         || value.engine !== expectedEngine
         || value.implementationSafe !== true
         || value.storageLayoutCompatible !== true) {
         throw new Error('uups-upgrade requires storage compatibility validation');
     }
     return {
-        kind: 'uups-upgrade',
+        kind: selectedKind,
         engine: expectedEngine,
         artifactFormat: format,
         implementationSafe: true,
@@ -424,7 +452,7 @@ const assertRoleShape = (selectedKind, deployments) => {
     const roles = deployments.map((deployment) => deployment.role).join(',');
     const expected = selectedKind === 'create2-deploy'
         ? 'contract'
-        : selectedKind === 'uups-placeholder-deploy'
+        : selectedKind === 'uups-placeholder-deploy' || selectedKind === 'transparent-deploy'
             ? 'implementation,proxy'
             : 'implementation';
     if (roles !== expected)
@@ -435,18 +463,31 @@ const normalizePreparationPlan = (raw) => {
     exactKeys(value, [
         'version', 'requestHash', 'kind', 'scheme', 'network', 'target', 'chainId',
         'contract', 'artifact', 'validation', 'deployments', 'transactions',
-    ], ['proxyKind'], 'preparation plan');
+    ], ['proxyKind', 'proxyAdmin'], 'preparation plan');
     if (value.version !== 1)
         throw new Error('preparation plan version must be 1');
+    if ('create2Factory' in value || 'postDeployCalls' in value || 'transferOwnership' in value) {
+        throw new Error('OpenZeppelin private deployment options are unsupported; use prepareWorkflow and explicit planned calls');
+    }
     const selectedKind = kind(value.kind);
     const selectedScheme = scheme(value.scheme);
     if (selectedKind === 'create2-deploy') {
         if (value.proxyKind !== undefined)
             throw new Error('create2-deploy must not contain proxyKind');
     }
-    else if (value.proxyKind !== 'uups') {
-        throw new Error(`${selectedKind} requires proxyKind uups`);
+    else if (value.proxyKind !== (selectedKind.startsWith('transparent-') ? 'transparent' : 'uups')) {
+        throw new Error(`${selectedKind} has mismatched proxyKind`);
+    }
+    let proxyAdmin;
+    if (selectedKind.startsWith('transparent-')) {
+        if (selectedScheme !== 'evm')
+            throw new Error('Transparent preparation requires ordinary EVM');
+        const admin = record(value.proxyAdmin, 'proxyAdmin');
+        exactKeys(admin, ['address', 'owner'], [], 'proxyAdmin');
+        proxyAdmin = { address: address(admin.address, 'proxyAdmin.address'), owner: address(admin.owner, 'proxyAdmin.owner') };
     }
+    else if (value.proxyAdmin !== undefined)
+        throw new Error('Unexpected ProxyAdmin on non-transparent plan');
     if (!Array.isArray(value.deployments))
         throw new Error('deployments must be an array');
     if (!Array.isArray(value.transactions))
@@ -469,7 +510,8 @@ const normalizePreparationPlan = (raw) => {
         target: (0, policy_js_1.validateNetworkAlias)(value.target, 'target'),
         chainId: integerString(value.chainId, 'chainId'),
         contract: nonEmptyString(value.contract, 'contract'),
-        ...(selectedKind === 'create2-deploy' ? {} : { proxyKind: 'uups' }),
+        ...(selectedKind === 'create2-deploy' ? {} : { proxyKind: selectedKind.startsWith('transparent-') ? 'transparent' : 'uups' }),
+        ...(proxyAdmin ? { proxyAdmin } : {}),
         artifact: normalizeArtifact(value.artifact),
         validation: normalizeValidation(value.validation, selectedKind, selectedScheme),
         deployments,