@rocketh/diamond 0.11.24 → 0.11.25-testing.1

package/dist/index.d.ts

@@ -1,7 +1,5 @@
 import { Abi } from 'abitype';
-import type { Artifact, DeploymentConstruction, Deployment, Libraries, LinkedData } from 'rocketh';
-import '@rocketh/deploy';
-import '@rocketh/read-execute';
+import type { Artifact, DeploymentConstruction, Deployment, Environment, Libraries, LinkedData } from 'rocketh';
 import type { EIP1193Account } from 'eip-1193';
 import { ContractFunctionArgs, ContractFunctionName, WriteContractParameters } from 'viem';
 import { DeployOptions } from '@rocketh/deploy';
@@ -54,9 +52,7 @@ export type DiamondDeploymentConstruction<TAbi extends Abi> = Omit<DeploymentCon
 export type DeployViaDiamondFunction = <TAbi extends Abi>(name: string, params: DiamondDeploymentConstruction<TAbi>, options: DiamondDeployOptions) => Promise<Deployment<TAbi> & {
     newlyDeployed: boolean;
 }>;
-declare module 'rocketh' {
-    interface Environment {
-        diamond: DeployViaDiamondFunction;
-    }
-}
+export declare function diamond<TAbi extends Abi>(env: Environment, name: string, params: DiamondDeploymentConstruction<TAbi>, options: DiamondDeployOptions): Promise<Deployment<TAbi> & {
+    newlyDeployed: boolean;
+}>;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

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

package/dist/index.js

@@ -1,6 +1,3 @@
-import '@rocketh/deploy';
-import '@rocketh/read-execute';
-import { extendEnvironment } from 'rocketh';
 import { encodeFunctionData, zeroAddress, } from 'viem';
 import { logs } from 'named-logs';
 import artifactPureDiamond from './hardhat-deploy-v1-artifacts/Diamond.js';
@@ -9,6 +6,8 @@ import artifactDiamondCutFact from './hardhat-deploy-v1-artifacts/DiamondCutFace
 import artifactOwnershipFacet from './hardhat-deploy-v1-artifacts/OwnershipFacet.js';
 import artifactDiamondERC165Init from './hardhat-deploy-v1-artifacts/DiamondERC165Init.js';
 import { filterABI, mergeABIs, sigsFromABI } from './utils.js';
+import { deploy } from '@rocketh/deploy';
+import { read, execute } from '@rocketh/read-execute';
 const logger = logs('@rocketh/diamond');
 const diamondAbi = mergeABIs([artifactPureDiamond.abi, artifactOwnershipFacet.abi, artifactDiamondLoupeFact.abi, artifactDiamondCutFact.abi], {
     check: true,
@@ -24,430 +23,426 @@ export var FacetCutAction;
     FacetCutAction[FacetCutAction["Replace"] = 1] = "Replace";
     FacetCutAction[FacetCutAction["Remove"] = 2] = "Remove";
 })(FacetCutAction || (FacetCutAction = {}));
-extendEnvironment((env) => {
-    async function diamond(name, params, options) {
-        let proxy;
-        const proxyName = `${name}_DiamondProxy`;
-        const oldDeployment = env.getOrNull(name);
-        if (oldDeployment) {
-            proxy = env.get(proxyName);
-        }
-        // TODO ?
-        // if (proxy && proxy.deployedBytecode === oldDiamonBase.deployedBytecode) {
-        // return _old_deployViaDiamondProxy(name, options);
-        // }
-        const { account, ...viemArgs } = params;
-        let deployerAddress;
-        if (account.startsWith('0x')) {
-            deployerAddress = account;
+export async function diamond(env, name, params, options) {
+    let proxy;
+    const proxyName = `${name}_DiamondProxy`;
+    const oldDeployment = env.getOrNull(name);
+    if (oldDeployment) {
+        proxy = env.get(proxyName);
+    }
+    // TODO ?
+    // if (proxy && proxy.deployedBytecode === oldDiamonBase.deployedBytecode) {
+    // return _old_deployViaDiamondProxy(name, options);
+    // }
+    const { account, ...viemArgs } = params;
+    let deployerAddress;
+    if (account.startsWith('0x')) {
+        deployerAddress = account;
+    }
+    else {
+        if (env.namedAccounts) {
+            deployerAddress = env.namedAccounts[account];
+            if (!deployerAddress) {
+                throw new Error(`no address for ${account}`);
+            }
         }
         else {
-            if (env.namedAccounts) {
-                deployerAddress = env.namedAccounts[account];
-                if (!deployerAddress) {
-                    throw new Error(`no address for ${account}`);
-                }
-            }
-            else {
-                throw new Error(`no accounts setup, cannot get address for ${account}`);
+            throw new Error(`no accounts setup, cannot get address for ${account}`);
+        }
+    }
+    // TODO
+    // if (options.diamondContract) {
+    // 	diamondArtifact = options.diamondContract;
+    // }
+    const expectedOwner = options?.owner || deployerAddress;
+    const newSelectors = [];
+    const facetSnapshot = [];
+    let oldFacets = [];
+    if (proxy) {
+        oldFacets = await read(env, proxy, {
+            functionName: 'facets',
+        });
+    }
+    // console.log({ oldFacets: JSON.stringify(oldFacets, null, "  ") });
+    const facetsSet = options.facets;
+    if (options?.defaultCutFacet === undefined || options.defaultCutFacet) {
+        facetsSet.push({
+            name: '_DefaultDiamondCutFacet',
+            artifact: artifactDiamondCutFact,
+            args: [],
+            deterministic: true,
+        });
+    }
+    if (options?.defaultOwnershipFacet === undefined || options.defaultOwnershipFacet) {
+        facetsSet.push({
+            name: '_DefaultDiamondOwnershipFacet',
+            artifact: artifactOwnershipFacet,
+            args: [],
+            deterministic: true,
+        });
+    }
+    facetsSet.push({
+        name: '_DefaultDiamondLoupeFacet',
+        artifact: artifactDiamondLoupeFact,
+        args: [],
+        deterministic: true,
+    });
+    let changesDetected = !oldDeployment;
+    // will be populated
+    let abi = artifactPureDiamond.abi.concat([]);
+    const facetCuts = [];
+    let executionFacetFound;
+    const excludeSelectors = options?.excludeSelectors || {};
+    let i = 0;
+    for (const facet of facetsSet) {
+        let deterministicFacet = true;
+        let linkedData = options?.linkedData;
+        let libraries = options?.libraries;
+        let facetArgs = options?.facetsArgs;
+        if (typeof facet !== 'string') {
+            if (facet.deterministic !== undefined) {
+                deterministicFacet = facet.deterministic;
             }
         }
-        // TODO
-        // if (options.diamondContract) {
-        // 	diamondArtifact = options.diamondContract;
-        // }
-        const expectedOwner = options?.owner || deployerAddress;
-        const newSelectors = [];
-        const facetSnapshot = [];
-        let oldFacets = [];
-        if (proxy) {
-            oldFacets = await env.read(proxy, {
-                functionName: 'facets',
-            });
+        let argsSpecific = false;
+        if (facet.linkedData) {
+            linkedData = facet.linkedData;
         }
-        // console.log({ oldFacets: JSON.stringify(oldFacets, null, "  ") });
-        const facetsSet = options.facets;
-        if (options?.defaultCutFacet === undefined || options.defaultCutFacet) {
-            facetsSet.push({
-                name: '_DefaultDiamondCutFacet',
-                artifact: artifactDiamondCutFact,
-                args: [],
-                deterministic: true,
-            });
+        if (facet.libraries) {
+            libraries = facet.libraries;
         }
-        if (options?.defaultOwnershipFacet === undefined || options.defaultOwnershipFacet) {
-            facetsSet.push({
-                name: '_DefaultDiamondOwnershipFacet',
-                artifact: artifactOwnershipFacet,
-                args: [],
-                deterministic: true,
-            });
+        if (facet.args !== undefined) {
+            // TODO fix in master
+            facetArgs = facet.args;
+            argsSpecific = true;
         }
-        facetsSet.push({
-            name: '_DefaultDiamondLoupeFacet',
-            artifact: artifactDiamondLoupeFact,
-            args: [],
-            deterministic: true,
+        const artifact = facet.artifact;
+        const facetName = facet.name || artifact.contractName;
+        if (!facetName) {
+            throw new Error(`artifact for facet at index: ${i} has no name, specify a name for the facet`);
+        }
+        const constructor = artifact.abi.find((fragment) => fragment.type === 'constructor');
+        if (!argsSpecific && (!constructor || constructor.inputs.length === 0)) {
+            // reset args for case where facet do not expect any and there was no specific args set on it
+            facetArgs = [];
+        }
+        let excludeSighashes = new Set();
+        if (facetName in excludeSelectors) {
+            excludeSighashes = new Set(excludeSelectors[facetName]);
+        }
+        abi = mergeABIs([abi, filterABI(artifact.abi, excludeSighashes)], {
+            check: true,
+            skipSupportsInterface: false,
         });
-        let changesDetected = !oldDeployment;
-        // will be populated
-        let abi = artifactPureDiamond.abi.concat([]);
-        const facetCuts = [];
-        let executionFacetFound;
-        const excludeSelectors = options?.excludeSelectors || {};
-        let i = 0;
-        for (const facet of facetsSet) {
-            let deterministicFacet = true;
-            let linkedData = options?.linkedData;
-            let libraries = options?.libraries;
-            let facetArgs = options?.facetsArgs;
-            if (typeof facet !== 'string') {
-                if (facet.deterministic !== undefined) {
-                    deterministicFacet = facet.deterministic;
+        const implementation = await deploy(env, facetName, {
+            ...params,
+            account: deployerAddress,
+            artifact,
+            args: facetArgs,
+        }, { libraries, linkedData, deterministic: deterministicFacet });
+        let facetAddress;
+        // TODO updated, check if it is correct, seem to be trigger if linkedData get updated
+        if (implementation.newlyDeployed) {
+            // console.log(`facet ${facet} deployed at ${implementation.address}`);
+            facetAddress = implementation.address;
+            const newFacet = {
+                facetAddress,
+                functionSelectors: sigsFromABI(filterABI(implementation.abi, excludeSighashes)),
+            };
+            facetSnapshot.push(newFacet);
+            newSelectors.push(...newFacet.functionSelectors);
+        }
+        else {
+            const oldImpl = env.get(facetName);
+            facetAddress = oldImpl.address;
+            const newFacet = {
+                facetAddress,
+                functionSelectors: sigsFromABI(filterABI(oldImpl.abi, excludeSighashes)),
+            };
+            facetSnapshot.push(newFacet);
+            newSelectors.push(...newFacet.functionSelectors);
+        }
+        if (options.execute && options.execute.type == 'facet') {
+            const methods = artifact.abi.filter((v) => v.name === options.execute?.functionName);
+            if (methods.length > 0) {
+                if (methods.length > 1) {
+                    throw new Error(`multiple method named "${options.execute.functionName}" found in facet`);
                 }
-            }
-            let argsSpecific = false;
-            if (facet.linkedData) {
-                linkedData = facet.linkedData;
-            }
-            if (facet.libraries) {
-                libraries = facet.libraries;
-            }
-            if (facet.args !== undefined) {
-                // TODO fix in master
-                facetArgs = facet.args;
-                argsSpecific = true;
-            }
-            const artifact = facet.artifact;
-            const facetName = facet.name || artifact.contractName;
-            if (!facetName) {
-                throw new Error(`artifact for facet at index: ${i} has no name, specify a name for the facet`);
-            }
-            const constructor = artifact.abi.find((fragment) => fragment.type === 'constructor');
-            if (!argsSpecific && (!constructor || constructor.inputs.length === 0)) {
-                // reset args for case where facet do not expect any and there was no specific args set on it
-                facetArgs = [];
-            }
-            let excludeSighashes = new Set();
-            if (facetName in excludeSelectors) {
-                excludeSighashes = new Set(excludeSelectors[facetName]);
-            }
-            abi = mergeABIs([abi, filterABI(artifact.abi, excludeSighashes)], {
-                check: true,
-                skipSupportsInterface: false,
-            });
-            const implementation = await env.deploy(facetName, {
-                ...params,
-                account: deployerAddress,
-                artifact,
-                args: facetArgs,
-            }, { libraries, linkedData, deterministic: deterministicFacet });
-            let facetAddress;
-            // TODO updated, check if it is correct, seem to be trigger if linkedData get updated
-            if (implementation.newlyDeployed) {
-                // console.log(`facet ${facet} deployed at ${implementation.address}`);
-                facetAddress = implementation.address;
-                const newFacet = {
-                    facetAddress,
-                    functionSelectors: sigsFromABI(filterABI(implementation.abi, excludeSighashes)),
-                };
-                facetSnapshot.push(newFacet);
-                newSelectors.push(...newFacet.functionSelectors);
-            }
-            else {
-                const oldImpl = env.get(facetName);
-                facetAddress = oldImpl.address;
-                const newFacet = {
-                    facetAddress,
-                    functionSelectors: sigsFromABI(filterABI(oldImpl.abi, excludeSighashes)),
-                };
-                facetSnapshot.push(newFacet);
-                newSelectors.push(...newFacet.functionSelectors);
-            }
-            if (options.execute && options.execute.type == 'facet') {
-                const methods = artifact.abi.filter((v) => v.name === options.execute?.functionName);
-                if (methods.length > 0) {
-                    if (methods.length > 1) {
-                        throw new Error(`multiple method named "${options.execute.functionName}" found in facet`);
+                else {
+                    if (executionFacetFound) {
+                        throw new Error(`multiple facet with method named "${options.execute.functionName}"`);
                     }
                     else {
-                        if (executionFacetFound) {
-                            throw new Error(`multiple facet with method named "${options.execute.functionName}"`);
-                        }
-                        else {
-                            executionFacetFound = facetAddress;
-                        }
+                        executionFacetFound = facetAddress;
                     }
                 }
             }
-            i++;
         }
-        const oldSelectors = [];
-        const oldSelectorsFacetAddress = {};
-        for (const oldFacet of oldFacets) {
-            for (const selector of oldFacet.functionSelectors) {
-                oldSelectors.push(selector);
-                oldSelectorsFacetAddress[selector] = oldFacet.facetAddress;
-            }
+        i++;
+    }
+    const oldSelectors = [];
+    const oldSelectorsFacetAddress = {};
+    for (const oldFacet of oldFacets) {
+        for (const selector of oldFacet.functionSelectors) {
+            oldSelectors.push(selector);
+            oldSelectorsFacetAddress[selector] = oldFacet.facetAddress;
         }
-        for (const newFacet of facetSnapshot) {
-            const selectorsToAdd = [];
-            const selectorsToReplace = [];
-            for (const selector of newFacet.functionSelectors) {
-                // TODO fix in master >0 to transform into >= 0
-                if (oldSelectors.indexOf(selector) >= 0) {
-                    if (oldSelectorsFacetAddress[selector].toLowerCase() !== newFacet.facetAddress.toLowerCase()) {
-                        selectorsToReplace.push(selector);
-                    }
-                }
-                else {
-                    selectorsToAdd.push(selector);
+    }
+    for (const newFacet of facetSnapshot) {
+        const selectorsToAdd = [];
+        const selectorsToReplace = [];
+        for (const selector of newFacet.functionSelectors) {
+            // TODO fix in master >0 to transform into >= 0
+            if (oldSelectors.indexOf(selector) >= 0) {
+                if (oldSelectorsFacetAddress[selector].toLowerCase() !== newFacet.facetAddress.toLowerCase()) {
+                    selectorsToReplace.push(selector);
                 }
             }
-            if (selectorsToReplace.length > 0) {
-                changesDetected = true;
-                facetCuts.push({
-                    facetAddress: newFacet.facetAddress,
-                    functionSelectors: selectorsToReplace,
-                    action: FacetCutAction.Replace,
-                });
-            }
-            if (selectorsToAdd.length > 0) {
-                changesDetected = true;
-                facetCuts.push({
-                    facetAddress: newFacet.facetAddress,
-                    functionSelectors: selectorsToAdd,
-                    action: FacetCutAction.Add,
-                });
+            else {
+                selectorsToAdd.push(selector);
             }
         }
-        const selectorsToDelete = [];
-        for (const selector of oldSelectors) {
-            if (newSelectors.indexOf(selector) === -1) {
-                selectorsToDelete.push(selector);
-            }
+        if (selectorsToReplace.length > 0) {
+            changesDetected = true;
+            facetCuts.push({
+                facetAddress: newFacet.facetAddress,
+                functionSelectors: selectorsToReplace,
+                action: FacetCutAction.Replace,
+            });
         }
-        if (selectorsToDelete.length > 0) {
+        if (selectorsToAdd.length > 0) {
             changesDetected = true;
-            facetCuts.unshift({
-                facetAddress: '0x0000000000000000000000000000000000000000',
-                functionSelectors: selectorsToDelete,
-                action: FacetCutAction.Remove,
+            facetCuts.push({
+                facetAddress: newFacet.facetAddress,
+                functionSelectors: selectorsToAdd,
+                action: FacetCutAction.Add,
             });
         }
-        let executeData = '0x';
-        let executeAddress = '0x0000000000000000000000000000000000000000';
-        if (options.execute) {
-            let addressSpecified;
-            if (options.execute.type === 'artifact') {
-                const executionDeployment = await env.deploy('', // we do not save it as it is deterministic anyway
-                {
+    }
+    const selectorsToDelete = [];
+    for (const selector of oldSelectors) {
+        if (newSelectors.indexOf(selector) === -1) {
+            selectorsToDelete.push(selector);
+        }
+    }
+    if (selectorsToDelete.length > 0) {
+        changesDetected = true;
+        facetCuts.unshift({
+            facetAddress: '0x0000000000000000000000000000000000000000',
+            functionSelectors: selectorsToDelete,
+            action: FacetCutAction.Remove,
+        });
+    }
+    let executeData = '0x';
+    let executeAddress = '0x0000000000000000000000000000000000000000';
+    if (options.execute) {
+        let addressSpecified;
+        if (options.execute.type === 'artifact') {
+            const executionDeployment = await deploy(env, '', // we do not save it as it is deterministic anyway
+            {
+                ...params,
+                artifact: options.execute.artifact,
+                args: [], // we expect artifact use for execute to have no contructor args
+                // TODO support these with constructor arguments ?
+            }, {
+                deterministic: true,
+            });
+            addressSpecified = executionDeployment.address;
+            executeData = encodeFunctionData({
+                abi: executionDeployment.abi,
+                functionName: options.execute.functionName,
+                args: options.execute.args,
+            });
+        }
+        executeAddress = addressSpecified || executionFacetFound || '0x0000000000000000000000000000000000000000';
+    }
+    if (changesDetected) {
+        if (!proxy) {
+            const diamondConstructorArgs = options?.diamondContractArgs || ['{owner}', '{facetCuts}', '{initializations}'];
+            const initializationsArgIndex = diamondConstructorArgs.indexOf('{initializations}');
+            const erc165InitArgIndex = diamondConstructorArgs.indexOf('{erc165}');
+            const initArgIndex = diamondConstructorArgs.indexOf('{init}');
+            const initAddressArgIndex = diamondConstructorArgs.indexOf('{initAddress}');
+            const initDataArgIndex = diamondConstructorArgs.indexOf('{initData}');
+            const ownerArgIndex = diamondConstructorArgs.indexOf('{owner}');
+            const facetCutsArgIndex = diamondConstructorArgs.indexOf('{facetCuts}');
+            if (initializationsArgIndex >= 0 && (initArgIndex >= 0 || erc165InitArgIndex >= 0 || initDataArgIndex >= 0)) {
+                throw new Error(`{initializations} found but also one or more of {init} {erc165} {initData}`);
+            }
+            // TODO option to add more to the list
+            // else mechanism to set it up differently ? LoupeFacet without supportsInterface
+            const interfaceList = ['0x48e2b093'];
+            if (options?.defaultCutFacet) {
+                interfaceList.push('0x1f931c1c');
+            }
+            if (options?.defaultOwnershipFacet) {
+                interfaceList.push('0x7f5828d0');
+            }
+            if (initializationsArgIndex >= 0 || erc165InitArgIndex >= 0) {
+                // TODO:TMP
+                const diamondERC165InitDeployment = await deploy(env, '_DefaultDiamondERC165Init', {
                     ...params,
-                    artifact: options.execute.artifact,
-                    args: [], // we expect artifact use for execute to have no contructor args
-                    // TODO support these with constructor arguments ?
-                }, {
-                    deterministic: true,
-                });
-                addressSpecified = executionDeployment.address;
-                executeData = encodeFunctionData({
-                    abi: executionDeployment.abi,
-                    functionName: options.execute.functionName,
-                    args: options.execute.args,
+                    artifact: artifactDiamondERC165Init,
+                    args: [],
+                }, { deterministic: true });
+                const interfaceInitCallData = encodeFunctionData({
+                    abi: artifactDiamondERC165Init.abi,
+                    functionName: 'setERC165',
+                    args: [interfaceList, []],
                 });
-            }
-            executeAddress = addressSpecified || executionFacetFound || '0x0000000000000000000000000000000000000000';
-        }
-        if (changesDetected) {
-            if (!proxy) {
-                const diamondConstructorArgs = options?.diamondContractArgs || ['{owner}', '{facetCuts}', '{initializations}'];
-                const initializationsArgIndex = diamondConstructorArgs.indexOf('{initializations}');
-                const erc165InitArgIndex = diamondConstructorArgs.indexOf('{erc165}');
-                const initArgIndex = diamondConstructorArgs.indexOf('{init}');
-                const initAddressArgIndex = diamondConstructorArgs.indexOf('{initAddress}');
-                const initDataArgIndex = diamondConstructorArgs.indexOf('{initData}');
-                const ownerArgIndex = diamondConstructorArgs.indexOf('{owner}');
-                const facetCutsArgIndex = diamondConstructorArgs.indexOf('{facetCuts}');
-                if (initializationsArgIndex >= 0 && (initArgIndex >= 0 || erc165InitArgIndex >= 0 || initDataArgIndex >= 0)) {
-                    throw new Error(`{initializations} found but also one or more of {init} {erc165} {initData}`);
-                }
-                // TODO option to add more to the list
-                // else mechanism to set it up differently ? LoupeFacet without supportsInterface
-                const interfaceList = ['0x48e2b093'];
-                if (options?.defaultCutFacet) {
-                    interfaceList.push('0x1f931c1c');
-                }
-                if (options?.defaultOwnershipFacet) {
-                    interfaceList.push('0x7f5828d0');
-                }
-                if (initializationsArgIndex >= 0 || erc165InitArgIndex >= 0) {
-                    // TODO:TMP
-                    const diamondERC165InitDeployment = await env.deploy('_DefaultDiamondERC165Init', {
-                        ...params,
-                        artifact: artifactDiamondERC165Init,
-                        args: [],
-                    }, { deterministic: true });
-                    const interfaceInitCallData = encodeFunctionData({
-                        abi: artifactDiamondERC165Init.abi,
-                        functionName: 'setERC165',
-                        args: [interfaceList, []],
+                if (initializationsArgIndex >= 0) {
+                    const initializations = [];
+                    initializations.push({
+                        initContract: diamondERC165InitDeployment.address,
+                        initData: interfaceInitCallData,
                     });
-                    if (initializationsArgIndex >= 0) {
-                        const initializations = [];
-                        initializations.push({
-                            initContract: diamondERC165InitDeployment.address,
-                            initData: interfaceInitCallData,
-                        });
-                        diamondConstructorArgs[initializationsArgIndex] = initializations;
-                    }
-                    else {
-                        diamondConstructorArgs[erc165InitArgIndex] = {
-                            initContract: diamondERC165InitDeployment.address,
-                            initData: interfaceInitCallData,
-                        };
-                    }
-                }
-                if (ownerArgIndex >= 0) {
-                    diamondConstructorArgs[ownerArgIndex] = expectedOwner;
+                    diamondConstructorArgs[initializationsArgIndex] = initializations;
                 }
                 else {
-                    // TODO ?
+                    diamondConstructorArgs[erc165InitArgIndex] = {
+                        initContract: diamondERC165InitDeployment.address,
+                        initData: interfaceInitCallData,
+                    };
                 }
-                if (facetCutsArgIndex >= 0) {
-                    diamondConstructorArgs[facetCutsArgIndex] = facetCuts;
+            }
+            if (ownerArgIndex >= 0) {
+                diamondConstructorArgs[ownerArgIndex] = expectedOwner;
+            }
+            else {
+                // TODO ?
+            }
+            if (facetCutsArgIndex >= 0) {
+                diamondConstructorArgs[facetCutsArgIndex] = facetCuts;
+            }
+            else {
+                throw new Error(`diamond constructor needs a {facetCuts} argument`);
+            }
+            if (executeData) {
+                if (initializationsArgIndex >= 0) {
+                    if (executeData !== '0x') {
+                        diamondConstructorArgs[initializationsArgIndex].push({
+                            initContract: executeAddress,
+                            initData: executeData,
+                        });
+                    }
                 }
                 else {
-                    throw new Error(`diamond constructor needs a {facetCuts} argument`);
-                }
-                if (executeData) {
-                    if (initializationsArgIndex >= 0) {
-                        if (executeData !== '0x') {
-                            diamondConstructorArgs[initializationsArgIndex].push({
-                                initContract: executeAddress,
-                                initData: executeData,
-                            });
-                        }
+                    if (initArgIndex >= 0) {
+                        diamondConstructorArgs[initArgIndex] = {
+                            initContract: executeAddress,
+                            initData: executeData,
+                        };
                     }
-                    else {
-                        if (initArgIndex >= 0) {
-                            diamondConstructorArgs[initArgIndex] = {
-                                initContract: executeAddress,
-                                initData: executeData,
-                            };
-                        }
-                        else if (initDataArgIndex >= 0) {
-                            diamondConstructorArgs[initDataArgIndex] = executeData;
-                            if (initAddressArgIndex >= 0) {
-                                diamondConstructorArgs[initAddressArgIndex] = executeAddress;
-                            }
-                        }
-                        else {
-                            throw new Error(`no {init} or {initData} found in list of args even though execute is set in option`);
+                    else if (initDataArgIndex >= 0) {
+                        diamondConstructorArgs[initDataArgIndex] = executeData;
+                        if (initAddressArgIndex >= 0) {
+                            diamondConstructorArgs[initAddressArgIndex] = executeAddress;
                         }
                     }
-                }
-                let salt = '0x0000000000000000000000000000000000000000000000000000000000000000';
-                if (typeof options.deterministicSalt !== 'undefined') {
-                    if (typeof options.deterministicSalt === 'string') {
-                        if (options.deterministicSalt === salt) {
-                            throw new Error(`deterministicSalt cannot be 0x000..., it needs to be a non-zero bytes32 salt. This is to ensure you are explicitly specifying different addresses for multiple diamonds`);
-                        }
-                        if (options.deterministicSalt.length !== 66) {
-                            throw new Error(`deterministicSalt needs to be a string of 66 hexadecimal characters (including the 0x prefix)`);
-                        }
-                        salt = options.deterministicSalt;
-                    }
                     else {
-                        throw new Error(`deterministicSalt need to be a string, an non-zero bytes32 salt`);
+                        throw new Error(`no {init} or {initData} found in list of args even though execute is set in option`);
                     }
                 }
-                proxy = await env.deploy(proxyName, {
-                    ...params,
-                    artifact: artifactDiamond,
-                    args: diamondConstructorArgs,
-                }, {
-                    deterministic: options.deterministicSalt,
-                    skipIfAlreadyDeployed: true,
-                });
-                await env.save(name, {
-                    ...proxy,
-                    abi,
-                    linkedData: options.linkedData,
-                    facets: facetSnapshot,
-                    execute: options.execute,
-                }, {
-                    doNotCountAsNewDeployment: proxy.newlyDeployed ? false : true,
-                });
             }
-            else {
-                if (!oldDeployment) {
-                    throw new Error(`Cannot find Deployment for ${name}`);
-                }
-                const currentOwner = await env.read(proxy, {
-                    functionName: 'owner',
-                });
-                if (currentOwner.toLowerCase() !== expectedOwner.toLowerCase()) {
-                    throw new Error('To change owner, you need to call `transferOwnership`');
+            let salt = '0x0000000000000000000000000000000000000000000000000000000000000000';
+            if (typeof options.deterministicSalt !== 'undefined') {
+                if (typeof options.deterministicSalt === 'string') {
+                    if (options.deterministicSalt === salt) {
+                        throw new Error(`deterministicSalt cannot be 0x000..., it needs to be a non-zero bytes32 salt. This is to ensure you are explicitly specifying different addresses for multiple diamonds`);
+                    }
+                    if (options.deterministicSalt.length !== 66) {
+                        throw new Error(`deterministicSalt needs to be a string of 66 hexadecimal characters (including the 0x prefix)`);
+                    }
+                    salt = options.deterministicSalt;
                 }
-                if (currentOwner === zeroAddress) {
-                    throw new Error('The Diamond belongs to no-one. It cannot be upgraded anymore');
+                else {
+                    throw new Error(`deterministicSalt need to be a string, an non-zero bytes32 salt`);
                 }
-                const txHash = await env.execute(proxy, {
-                    ...params,
-                    account: expectedOwner,
-                    functionName: 'diamondCut',
-                    args: [
-                        facetCuts,
-                        executeData === '0x'
-                            ? '0x0000000000000000000000000000000000000000'
-                            : executeAddress || proxy.address, // TODO  || proxy.address should not be required, the facet should have been found
-                        executeData,
-                    ],
-                    value: undefined,
-                });
-                const diamondDeployment = {
-                    ...oldDeployment,
-                    linkedData: options.linkedData,
-                    address: proxy.address,
-                    abi,
-                    facets: facetSnapshot,
-                    execute: options.execute, // TODO add receipt + tx hash
-                };
-                // // TODO reenable history with options
-                // if (oldDeployment.history && oldDeployment.history) {
-                // 	diamondDeployment.history = diamondDeployment.history
-                // 		? diamondDeployment.history.concat([oldDeployment])
-                // 		: [oldDeployment];
-                // }
-                await env.save(name, diamondDeployment);
             }
-            const deployment = env.get(name);
-            return {
-                ...deployment,
-                newlyDeployed: true,
-            };
+            proxy = await deploy(env, proxyName, {
+                ...params,
+                artifact: artifactDiamond,
+                args: diamondConstructorArgs,
+            }, {
+                deterministic: options.deterministicSalt,
+                skipIfAlreadyDeployed: true,
+            });
+            await env.save(name, {
+                ...proxy,
+                abi,
+                linkedData: options.linkedData,
+                facets: facetSnapshot,
+                execute: options.execute,
+            }, {
+                doNotCountAsNewDeployment: proxy.newlyDeployed ? false : true,
+            });
         }
         else {
-            // const oldDeployment = await partialExtension.get(name);
-            // const proxiedDeployment: DeploymentSubmission = {
-            //   ...oldDeployment,
-            //   facets: facetSnapshot,
-            //   abi,
-            //   execute: options.execute,
-            // };
-            // // TODO ?
-            // // proxiedDeployment.history = proxiedDeployment.history
-            // //   ? proxiedDeployment.history.concat([oldDeployment])
-            // //   : [oldDeployment];
-            // await saveDeployment(name, proxiedDeployment);
-            const deployment = await env.get(name);
-            return {
-                ...deployment,
-                newlyDeployed: false,
+            if (!oldDeployment) {
+                throw new Error(`Cannot find Deployment for ${name}`);
+            }
+            const currentOwner = await read(env, proxy, {
+                functionName: 'owner',
+            });
+            if (currentOwner.toLowerCase() !== expectedOwner.toLowerCase()) {
+                throw new Error('To change owner, you need to call `transferOwnership`');
+            }
+            if (currentOwner === zeroAddress) {
+                throw new Error('The Diamond belongs to no-one. It cannot be upgraded anymore');
+            }
+            const txHash = await execute(env, proxy, {
+                ...params,
+                account: expectedOwner,
+                functionName: 'diamondCut',
+                args: [
+                    facetCuts,
+                    executeData === '0x'
+                        ? '0x0000000000000000000000000000000000000000'
+                        : executeAddress || proxy.address, // TODO  || proxy.address should not be required, the facet should have been found
+                    executeData,
+                ],
+                value: undefined,
+            });
+            const diamondDeployment = {
+                ...oldDeployment,
+                linkedData: options.linkedData,
+                address: proxy.address,
+                abi,
+                facets: facetSnapshot,
+                execute: options.execute, // TODO add receipt + tx hash
             };
+            // // TODO reenable history with options
+            // if (oldDeployment.history && oldDeployment.history) {
+            // 	diamondDeployment.history = diamondDeployment.history
+            // 		? diamondDeployment.history.concat([oldDeployment])
+            // 		: [oldDeployment];
+            // }
+            await env.save(name, diamondDeployment);
         }
+        const deployment = env.get(name);
+        return {
+            ...deployment,
+            newlyDeployed: true,
+        };
     }
-    env.diamond = diamond;
-    return env;
-});
+    else {
+        // const oldDeployment = await partialExtension.get(name);
+        // const proxiedDeployment: DeploymentSubmission = {
+        //   ...oldDeployment,
+        //   facets: facetSnapshot,
+        //   abi,
+        //   execute: options.execute,
+        // };
+        // // TODO ?
+        // // proxiedDeployment.history = proxiedDeployment.history
+        // //   ? proxiedDeployment.history.concat([oldDeployment])
+        // //   : [oldDeployment];
+        // await saveDeployment(name, proxiedDeployment);
+        const deployment = await env.get(name);
+        return {
+            ...deployment,
+            newlyDeployed: false,
+        };
+    }
+}
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAGN,kBAAkB,EAElB,WAAW,GACX,MAAM,MAAM,CAAC;AACd,OAAO,EAAC,IAAI,EAAC,MAAM,YAAY,CAAC;AAChC,OAAO,mBAAmB,MAAM,0CAA0C,CAAC;AAC3E,OAAO,wBAAwB,MAAM,oDAAoD,CAAC;AAC1F,OAAO,sBAAsB,MAAM,kDAAkD,CAAC;AACtF,OAAO,sBAAsB,MAAM,iDAAiD,CAAC;AACrF,OAAO,yBAAyB,MAAM,oDAAoD,CAAC;AAC3F,OAAO,EAAC,SAAS,EAAE,SAAS,EAAE,WAAW,EAAC,MAAM,YAAY,CAAC;AAC7D,OAAO,EAAC,MAAM,EAAgB,MAAM,iBAAiB,CAAC;AAEtD,OAAO,EAAC,IAAI,EAAE,OAAO,EAAC,MAAM,uBAAuB,CAAC;AAEpD,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,CAAC;AASxC,MAAM,UAAU,GAAG,SAAS,CAC3B,CAAC,mBAAmB,CAAC,GAAG,EAAE,sBAAsB,CAAC,GAAG,EAAE,wBAAwB,CAAC,GAAG,EAAE,sBAAsB,CAAC,GAAG,CAAC,EAC/G;IACC,KAAK,EAAE,IAAI;IACX,qBAAqB,EAAE,IAAI;CAC3B,CACD,CAAC;AACF,MAAM,eAAe,GAAG;IACvB,GAAG,mBAAmB;IACtB,GAAG,EAAE,UAAU;CACf,CAAC;AAOF,MAAM,CAAN,IAAY,cAIX;AAJD,WAAY,cAAc;IACzB,iDAAG,CAAA;IACH,yDAAO,CAAA;IACP,uDAAM,CAAA;AACP,CAAC,EAJW,cAAc,KAAd,cAAc,QAIzB;AA8ED,MAAM,CAAC,KAAK,UAAU,OAAO,CAC5B,GAAgB,EAChB,IAAY,EACZ,MAA2C,EAC3C,OAA6B;IAE7B,IAAI,KAAyC,CAAC;IAC9C,MAAM,SAAS,GAAG,GAAG,IAAI,eAAe,CAAC;IAEzC,MAAM,aAAa,GAAG,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC1C,IAAI,aAAa,EAAE,CAAC;QACnB,KAAK,GAAG,GAAG,CAAC,GAAG,CAAa,SAAS,CAAC,CAAC;IACxC,CAAC;IACD,SAAS;IACT,4EAA4E;IAC5E,oDAAoD;IACpD,IAAI;IAEJ,MAAM,EAAC,OAAO,EAAE,GAAG,QAAQ,EAAC,GAAG,MAAM,CAAC;IACtC,IAAI,eAA8B,CAAC;IACnC,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QAC9B,eAAe,GAAG,OAAwB,CAAC;IAC5C,CAAC;SAAM,CAAC;QACP,IAAI,GAAG,CAAC,aAAa,EAAE,CAAC;YACvB,eAAe,GAAG,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;YAC7C,IAAI,CAAC,eAAe,EAAE,CAAC;gBACtB,MAAM,IAAI,KAAK,CAAC,kBAAkB,OAAO,EAAE,CAAC,CAAC;YAC9C,CAAC;QACF,CAAC;aAAM,CAAC;YACP,MAAM,IAAI,KAAK,CAAC,6CAA6C,OAAO,EAAE,CAAC,CAAC;QACzE,CAAC;IACF,CAAC;IAED,OAAO;IACP,iCAAiC;IACjC,8CAA8C;IAC9C,IAAI;IAEJ,MAAM,aAAa,GAAG,OAAO,EAAE,KAAK,IAAI,eAAe,CAAC;IAExD,MAAM,YAAY,GAAa,EAAE,CAAC;IAClC,MAAM,aAAa,GAAY,EAAE,CAAC;IAClC,IAAI,SAAS,GAAqB,EAAE,CAAC;IACrC,IAAI,KAAK,EAAE,CAAC;QACX,SAAS,GAAG,MAAM,IAAI,CAAC,GAAG,EAAE,KAA+C,EAAE;YAC5E,YAAY,EAAE,QAAQ;SACtB,CAAC,CAAC;IACJ,CAAC;IACD,qEAAqE;IAErE,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;IACjC,IAAI,OAAO,EAAE,eAAe,KAAK,SAAS,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;QACvE,SAAS,CAAC,IAAI,CAAC;YACd,IAAI,EAAE,yBAAyB;YAC/B,QAAQ,EAAE,sBAAsB;YAChC,IAAI,EAAE,EAAE;YACR,aAAa,EAAE,IAAI;SACnB,CAAC,CAAC;IACJ,CAAC;IACD,IAAI,OAAO,EAAE,qBAAqB,KAAK,SAAS,IAAI,OAAO,CAAC,qBAAqB,EAAE,CAAC;QACnF,SAAS,CAAC,IAAI,CAAC;YACd,IAAI,EAAE,+BAA+B;YACrC,QAAQ,EAAE,sBAAsB;YAChC,IAAI,EAAE,EAAE;YACR,aAAa,EAAE,IAAI;SACnB,CAAC,CAAC;IACJ,CAAC;IACD,SAAS,CAAC,IAAI,CAAC;QACd,IAAI,EAAE,2BAA2B;QACjC,QAAQ,EAAE,wBAAwB;QAClC,IAAI,EAAE,EAAE;QACR,aAAa,EAAE,IAAI;KACnB,CAAC,CAAC;IAEH,IAAI,eAAe,GAAG,CAAC,aAAa,CAAC;IACrC,oBAAoB;IACpB,IAAI,GAAG,GAAS,mBAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAoB,CAAC;IACtE,MAAM,SAAS,GAAe,EAAE,CAAC;IACjC,IAAI,mBAA8C,CAAC;IACnD,MAAM,gBAAgB,GAAoC,OAAO,EAAE,gBAAgB,IAAI,EAAE,CAAC;IAC1F,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,KAAK,MAAM,KAAK,IAAI,SAAS,EAAE,CAAC;QAC/B,IAAI,kBAAkB,GAA4B,IAAI,CAAC;QAEvD,IAAI,UAAU,GAAG,OAAO,EAAE,UAAU,CAAC;QACrC,IAAI,SAAS,GAAG,OAAO,EAAE,SAAS,CAAC;QACnC,IAAI,SAAS,GAAG,OAAO,EAAE,UAAU,CAAC;QACpC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC/B,IAAI,KAAK,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;gBACvC,kBAAkB,GAAG,KAAK,CAAC,aAAa,CAAC;YAC1C,CAAC;QACF,CAAC;QACD,IAAI,YAAY,GAAG,KAAK,CAAC;QAEzB,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;YACtB,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC;QAC/B,CAAC;QACD,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;YACrB,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;QAC7B,CAAC;QACD,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC9B,qBAAqB;YACrB,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC;YACvB,YAAY,GAAG,IAAI,CAAC;QACrB,CAAC;QACD,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QAEhC,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,IAAI,QAAQ,CAAC,YAAY,CAAC;QACtD,IAAI,CAAC,SAAS,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,4CAA4C,CAAC,CAAC;QAChG,CAAC;QACD,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,aAAa,CAAC,CAAC;QACrF,IAAI,CAAC,YAAY,IAAI,CAAC,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC;YACxE,6FAA6F;YAC7F,SAAS,GAAG,EAAE,CAAC;QAChB,CAAC;QACD,IAAI,gBAAgB,GAAuB,IAAI,GAAG,EAAE,CAAC;QACrD,IAAI,SAAS,IAAI,gBAAgB,EAAE,CAAC;YACnC,gBAAgB,GAAG,IAAI,GAAG,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC;QACzD,CAAC;QACD,GAAG,GAAG,SAAS,CAAO,CAAC,GAAG,EAAE,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC,EAAE;YACvE,KAAK,EAAE,IAAI;YACX,qBAAqB,EAAE,KAAK;SAC5B,CAAC,CAAC;QAEH,MAAM,cAAc,GAAG,MAAM,MAAM,CAClC,GAAG,EACH,SAAS,EACT;YACC,GAAG,MAAM;YACT,OAAO,EAAE,eAAe;YACxB,QAAQ;YACR,IAAI,EAAE,SAAS;SACf,EACD,EAAC,SAAS,EAAE,UAAU,EAAE,aAAa,EAAE,kBAAkB,EAAC,CAC1D,CAAC;QAEF,IAAI,YAA2B,CAAC;QAChC,qFAAqF;QACrF,IAAI,cAAc,CAAC,aAAa,EAAE,CAAC;YAClC,uEAAuE;YACvE,YAAY,GAAG,cAAc,CAAC,OAAO,CAAC;YACtC,MAAM,QAAQ,GAAG;gBAChB,YAAY;gBACZ,iBAAiB,EAAE,WAAW,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;aAC/E,CAAC;YACF,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC7B,YAAY,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,iBAAiB,CAAC,CAAC;QAClD,CAAC;aAAM,CAAC;YACP,MAAM,OAAO,GAAG,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACnC,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;YAC/B,MAAM,QAAQ,GAAG;gBAChB,YAAY;gBACZ,iBAAiB,EAAE,WAAW,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;aACxE,CAAC;YACF,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC7B,YAAY,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,iBAAiB,CAAC,CAAC;QAClD,CAAC;QAED,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,IAAI,IAAI,OAAO,EAAE,CAAC;YACxD,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAE,CAAS,CAAC,IAAI,KAAK,OAAO,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YAC9F,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxB,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACxB,MAAM,IAAI,KAAK,CAAC,0BAA0B,OAAO,CAAC,OAAO,CAAC,YAAY,kBAAkB,CAAC,CAAC;gBAC3F,CAAC;qBAAM,CAAC;oBACP,IAAI,mBAAmB,EAAE,CAAC;wBACzB,MAAM,IAAI,KAAK,CAAC,qCAAqC,OAAO,CAAC,OAAO,CAAC,YAAY,GAAG,CAAC,CAAC;oBACvF,CAAC;yBAAM,CAAC;wBACP,mBAAmB,GAAG,YAAY,CAAC;oBACpC,CAAC;gBACF,CAAC;YACF,CAAC;QACF,CAAC;QAED,CAAC,EAAE,CAAC;IACL,CAAC;IAED,MAAM,YAAY,GAAoB,EAAE,CAAC;IACzC,MAAM,wBAAwB,GAA+C,EAAE,CAAC;IAChF,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QAClC,KAAK,MAAM,QAAQ,IAAI,QAAQ,CAAC,iBAAiB,EAAE,CAAC;YACnD,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC5B,wBAAwB,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC,YAAY,CAAC;QAC5D,CAAC;IACF,CAAC;IAED,KAAK,MAAM,QAAQ,IAAI,aAAa,EAAE,CAAC;QACtC,MAAM,cAAc,GAAoB,EAAE,CAAC;QAC3C,MAAM,kBAAkB,GAAoB,EAAE,CAAC;QAE/C,KAAK,MAAM,QAAQ,IAAI,QAAQ,CAAC,iBAAiB,EAAE,CAAC;YACnD,+CAA+C;YAC/C,IAAI,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBACzC,IAAI,wBAAwB,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC,YAAY,CAAC,WAAW,EAAE,EAAE,CAAC;oBAC9F,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACnC,CAAC;YACF,CAAC;iBAAM,CAAC;gBACP,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC/B,CAAC;QACF,CAAC;QAED,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnC,eAAe,GAAG,IAAI,CAAC;YACvB,SAAS,CAAC,IAAI,CAAC;gBACd,YAAY,EAAE,QAAQ,CAAC,YAAY;gBACnC,iBAAiB,EAAE,kBAAkB;gBACrC,MAAM,EAAE,cAAc,CAAC,OAAO;aAC9B,CAAC,CAAC;QACJ,CAAC;QAED,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/B,eAAe,GAAG,IAAI,CAAC;YACvB,SAAS,CAAC,IAAI,CAAC;gBACd,YAAY,EAAE,QAAQ,CAAC,YAAY;gBACnC,iBAAiB,EAAE,cAAc;gBACjC,MAAM,EAAE,cAAc,CAAC,GAAG;aAC1B,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;IAED,MAAM,iBAAiB,GAAoB,EAAE,CAAC;IAC9C,KAAK,MAAM,QAAQ,IAAI,YAAY,EAAE,CAAC;QACrC,IAAI,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YAC3C,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC;IACF,CAAC;IAED,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClC,eAAe,GAAG,IAAI,CAAC;QACvB,SAAS,CAAC,OAAO,CAAC;YACjB,YAAY,EAAE,4CAA4C;YAC1D,iBAAiB,EAAE,iBAAiB;YACpC,MAAM,EAAE,cAAc,CAAC,MAAM;SAC7B,CAAC,CAAC;IACJ,CAAC;IAED,IAAI,WAAW,GAAkB,IAAI,CAAC;IACtC,IAAI,cAAc,GAAkB,4CAA4C,CAAC;IAEjF,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACrB,IAAI,gBAA2C,CAAC;QAChD,IAAI,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YACzC,MAAM,mBAAmB,GAAG,MAAM,MAAM,CACvC,GAAG,EACH,EAAE,EAAE,kDAAkD;YACtD;gBACC,GAAG,MAAM;gBACT,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ;gBAClC,IAAI,EAAE,EAAE,EAAE,gEAAgE;gBAC1E,kDAAkD;aAClD,EACD;gBACC,aAAa,EAAE,IAAI;aACnB,CACD,CAAC;YAEF,gBAAgB,GAAG,mBAAmB,CAAC,OAAO,CAAC;YAE/C,WAAW,GAAG,kBAAkB,CAAC;gBAChC,GAAG,EAAE,mBAAmB,CAAC,GAAG;gBAC5B,YAAY,EAAE,OAAO,CAAC,OAAO,CAAC,YAAY;gBAC1C,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI;aAC1B,CAAC,CAAC;QACJ,CAAC;QACD,cAAc,GAAG,gBAAgB,IAAI,mBAAmB,IAAI,4CAA4C,CAAC;IAC1G,CAAC;IAED,IAAI,eAAe,EAAE,CAAC;QACrB,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,MAAM,sBAAsB,GAAG,OAAO,EAAE,mBAAmB,IAAI,CAAC,SAAS,EAAE,aAAa,EAAE,mBAAmB,CAAC,CAAC;YAE/G,MAAM,uBAAuB,GAAG,sBAAsB,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;YACpF,MAAM,kBAAkB,GAAG,sBAAsB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YACtE,MAAM,YAAY,GAAG,sBAAsB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC9D,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;YAC5E,MAAM,gBAAgB,GAAG,sBAAsB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;YACtE,MAAM,aAAa,GAAG,sBAAsB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAChE,MAAM,iBAAiB,GAAG,sBAAsB,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;YACxE,IAAI,uBAAuB,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,IAAI,kBAAkB,IAAI,CAAC,IAAI,gBAAgB,IAAI,CAAC,CAAC,EAAE,CAAC;gBAC7G,MAAM,IAAI,KAAK,CAAC,4EAA4E,CAAC,CAAC;YAC/F,CAAC;YAED,sCAAsC;YACtC,iFAAiF;YACjF,MAAM,aAAa,GAAoB,CAAC,YAAY,CAAC,CAAC;YACtD,IAAI,OAAO,EAAE,eAAe,EAAE,CAAC;gBAC9B,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAClC,CAAC;YACD,IAAI,OAAO,EAAE,qBAAqB,EAAE,CAAC;gBACpC,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAClC,CAAC;YAED,IAAI,uBAAuB,IAAI,CAAC,IAAI,kBAAkB,IAAI,CAAC,EAAE,CAAC;gBAC7D,WAAW;gBACX,MAAM,2BAA2B,GAAG,MAAM,MAAM,CAC/C,GAAG,EACH,2BAA2B,EAC3B;oBACC,GAAG,MAAM;oBACT,QAAQ,EAAE,yBAAyB;oBACnC,IAAI,EAAE,EAAE;iBACR,EACD,EAAC,aAAa,EAAE,IAAI,EAAC,CACrB,CAAC;gBAEF,MAAM,qBAAqB,GAAG,kBAAkB,CAAC;oBAChD,GAAG,EAAE,yBAAyB,CAAC,GAAG;oBAClC,YAAY,EAAE,WAAW;oBACzB,IAAI,EAAE,CAAC,aAAa,EAAE,EAAE,CAAC;iBACzB,CAAC,CAAC;gBAEH,IAAI,uBAAuB,IAAI,CAAC,EAAE,CAAC;oBAClC,MAAM,eAAe,GAAG,EAAE,CAAC;oBAC3B,eAAe,CAAC,IAAI,CAAC;wBACpB,YAAY,EAAE,2BAA2B,CAAC,OAAO;wBACjD,QAAQ,EAAE,qBAAqB;qBAC/B,CAAC,CAAC;oBACH,sBAAsB,CAAC,uBAAuB,CAAC,GAAG,eAAe,CAAC;gBACnE,CAAC;qBAAM,CAAC;oBACP,sBAAsB,CAAC,kBAAkB,CAAC,GAAG;wBAC5C,YAAY,EAAE,2BAA2B,CAAC,OAAO;wBACjD,QAAQ,EAAE,qBAAqB;qBAC/B,CAAC;gBACH,CAAC;YACF,CAAC;YAED,IAAI,aAAa,IAAI,CAAC,EAAE,CAAC;gBACxB,sBAAsB,CAAC,aAAa,CAAC,GAAG,aAAa,CAAC;YACvD,CAAC;iBAAM,CAAC;gBACP,SAAS;YACV,CAAC;YAED,IAAI,iBAAiB,IAAI,CAAC,EAAE,CAAC;gBAC5B,sBAAsB,CAAC,iBAAiB,CAAC,GAAG,SAAS,CAAC;YACvD,CAAC;iBAAM,CAAC;gBACP,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;YACrE,CAAC;YAED,IAAI,WAAW,EAAE,CAAC;gBACjB,IAAI,uBAAuB,IAAI,CAAC,EAAE,CAAC;oBAClC,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;wBAC1B,sBAAsB,CAAC,uBAAuB,CAAC,CAAC,IAAI,CAAC;4BACpD,YAAY,EAAE,cAAc;4BAC5B,QAAQ,EAAE,WAAW;yBACrB,CAAC,CAAC;oBACJ,CAAC;gBACF,CAAC;qBAAM,CAAC;oBACP,IAAI,YAAY,IAAI,CAAC,EAAE,CAAC;wBACvB,sBAAsB,CAAC,YAAY,CAAC,GAAG;4BACtC,YAAY,EAAE,cAAc;4BAC5B,QAAQ,EAAE,WAAW;yBACrB,CAAC;oBACH,CAAC;yBAAM,IAAI,gBAAgB,IAAI,CAAC,EAAE,CAAC;wBAClC,sBAAsB,CAAC,gBAAgB,CAAC,GAAG,WAAW,CAAC;wBACvD,IAAI,mBAAmB,IAAI,CAAC,EAAE,CAAC;4BAC9B,sBAAsB,CAAC,mBAAmB,CAAC,GAAG,cAAc,CAAC;wBAC9D,CAAC;oBACF,CAAC;yBAAM,CAAC;wBACP,MAAM,IAAI,KAAK,CAAC,oFAAoF,CAAC,CAAC;oBACvG,CAAC;gBACF,CAAC;YACF,CAAC;YAED,IAAI,IAAI,GAAG,oEAAoE,CAAC;YAChF,IAAI,OAAO,OAAO,CAAC,iBAAiB,KAAK,WAAW,EAAE,CAAC;gBACtD,IAAI,OAAO,OAAO,CAAC,iBAAiB,KAAK,QAAQ,EAAE,CAAC;oBACnD,IAAI,OAAO,CAAC,iBAAiB,KAAK,IAAI,EAAE,CAAC;wBACxC,MAAM,IAAI,KAAK,CACd,yKAAyK,CACzK,CAAC;oBACH,CAAC;oBACD,IAAI,OAAO,CAAC,iBAAiB,CAAC,MAAM,KAAK,EAAE,EAAE,CAAC;wBAC7C,MAAM,IAAI,KAAK,CACd,+FAA+F,CAC/F,CAAC;oBACH,CAAC;oBACD,IAAI,GAAG,OAAO,CAAC,iBAAiB,CAAC;gBAClC,CAAC;qBAAM,CAAC;oBACP,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;gBACpF,CAAC;YACF,CAAC;YAED,KAAK,GAAG,MAAM,MAAM,CACnB,GAAG,EACH,SAAS,EACT;gBACC,GAAG,MAAM;gBACT,QAAQ,EAAE,eAAkD;gBAC5D,IAAI,EAAE,sBAA6B;aACnC,EACD;gBACC,aAAa,EAAE,OAAO,CAAC,iBAAiB;gBACxC,qBAAqB,EAAE,IAAI;aAC3B,CACD,CAAC;YAEF,MAAM,GAAG,CAAC,IAAI,CACb,IAAI,EACJ;gBACC,GAAG,KAAK;gBACR,GAAG;gBACH,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,MAAM,EAAE,aAAa;gBACrB,OAAO,EAAE,OAAO,CAAC,OAAO;aACxB,EACD;gBACC,yBAAyB,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;aAC7D,CACD,CAAC;QACH,CAAC;aAAM,CAAC;YACP,IAAI,CAAC,aAAa,EAAE,CAAC;gBACpB,MAAM,IAAI,KAAK,CAAC,8BAA8B,IAAI,EAAE,CAAC,CAAC;YACvD,CAAC;YACD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,GAAG,EAAE,KAAiD,EAAE;gBACvF,YAAY,EAAE,OAAO;aACrB,CAAC,CAAC;YACH,IAAI,YAAY,CAAC,WAAW,EAAE,KAAK,aAAa,CAAC,WAAW,EAAE,EAAE,CAAC;gBAChE,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;YAC1E,CAAC;YACD,IAAI,YAAY,KAAK,WAAW,EAAE,CAAC;gBAClC,MAAM,IAAI,KAAK,CAAC,8DAA8D,CAAC,CAAC;YACjF,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,EAAE,KAA6C,EAAE;gBAChF,GAAG,MAAM;gBACT,OAAO,EAAE,aAAa;gBACtB,YAAY,EAAE,YAAY;gBAC1B,IAAI,EAAE;oBACL,SAAS;oBACT,WAAW,KAAK,IAAI;wBACnB,CAAC,CAAE,4CAA8D;wBACjE,CAAC,CAAC,cAAc,IAAI,KAAK,CAAC,OAAO,EAAE,kFAAkF;oBACtH,WAAW;iBACX;gBACD,KAAK,EAAE,SAAS;aAChB,CAAC,CAAC;YAEH,MAAM,iBAAiB,GAAqB;gBAC3C,GAAG,aAAa;gBAChB,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,GAAG;gBACH,MAAM,EAAE,aAAa;gBACrB,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,6BAA6B;aACvD,CAAC;YAEF,wCAAwC;YACxC,wDAAwD;YACxD,yDAAyD;YACzD,wDAAwD;YACxD,uBAAuB;YACvB,IAAI;YAEJ,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QACzC,CAAC;QAED,MAAM,UAAU,GAAG,GAAG,CAAC,GAAG,CAAO,IAAI,CAAC,CAAC;QACvC,OAAO;YACN,GAAG,UAAU;YACb,aAAa,EAAE,IAAI;SACnB,CAAC;IACH,CAAC;SAAM,CAAC;QACP,0DAA0D;QAE1D,oDAAoD;QACpD,sBAAsB;QACtB,2BAA2B;QAC3B,SAAS;QACT,8BAA8B;QAC9B,KAAK;QACL,YAAY;QACZ,2DAA2D;QAC3D,2DAA2D;QAC3D,0BAA0B;QAC1B,iDAAiD;QAEjD,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,GAAG,CAAO,IAAI,CAAC,CAAC;QAC7C,OAAO;YACN,GAAG,UAAU;YACb,aAAa,EAAE,KAAK;SACpB,CAAC;IACH,CAAC;AACF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rocketh/diamond",
-  "version": "0.11.24",
+  "version": "0.11.25-testing.1",
   "description": "provide diamond support for rocketh/hardhat-deploy",
   "publishConfig": {
     "access": "public"
@@ -25,14 +25,14 @@
     "eip-1193": "^0.6.2",
     "rimraf": "^6.0.1",
     "typescript": "^5.8.2",
-    "@rocketh/deploy": "0.11.21",
-    "@rocketh/read-execute": "0.11.22",
-    "rocketh": "0.11.21"
+    "@rocketh/deploy": "0.11.22-testing.1",
+    "rocketh": "0.11.22-testing.1",
+    "@rocketh/read-execute": "0.11.23-testing.1"
   },
   "peerDependencies": {
-    "@rocketh/deploy": "0.11.21",
-    "@rocketh/read-execute": "0.11.22",
-    "rocketh": "0.11.21"
+    "@rocketh/deploy": "0.11.22-testing.1",
+    "@rocketh/read-execute": "0.11.23-testing.1",
+    "rocketh": "0.11.22-testing.1"
   },
   "dependencies": {
     "named-logs": "^0.3.2",