hardhat-deploy 0.11.0-next.2 → 0.11.0-next.3

package/dist/src/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/helpers.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,mBAAmB,EAEpB,MAAM,0BAA0B,CAAC;AAQlC,OAAO,EAAC,SAAS,EAAC,MAAM,0BAA0B,CAAC;AAKnD,OAAO,EAGL,oBAAoB,EAKpB,OAAO,EAKP,oBAAoB,EAMrB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAC,gBAAgB,EAAC,MAAM,kBAAkB,CAAC;AAelD,OAAO,EAAC,QAAQ,EAAE,gBAAgB,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAClE,OAAO,EAAC,kBAAkB,EAAC,MAAM,sBAAsB,CAAC;AAiKxD,wBAAgB,UAAU,CACxB,iBAAiB,EAAE,kBAAkB,EACrC,gBAAgB,EAAE,gBAAgB,EAClC,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,QAAQ,CAAC,EAChD,cAAc,EAAE,CACd,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,oBAAoB,EAChC,YAAY,CAAC,EAAE,MAAM,KAClB,OAAO,CAAC,IAAI,CAAC,EAClB,cAAc,EAAE,MAAM,OAAO,EAC7B,WAAW,EAAE,CACX,UAAU,EAAE,mBAAmB,EAC/B,IAAI,CAAC,EAAE,MAAM,EACb,IAAI,CAAC,EAAE,GAAG,KACP,OAAO,CAAC,mBAAmB,CAAC,EACjC,WAAW,EAAE,MAAM,OAAO,CAAC;IACzB,QAAQ,EAAE,SAAS,GAAG,SAAS,CAAC;IAChC,YAAY,EAAE,SAAS,GAAG,SAAS,CAAC;IACpC,oBAAoB,EAAE,SAAS,GAAG,SAAS,CAAC;CAC7C,CAAC,EACF,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,EAC7B,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,GAC3B;IACD,SAAS,EAAE,oBAAoB,CAAC;IAChC,KAAK,EAAE;QACL,2BAA2B,EAAE,CAC3B,UAAU,EAAE;YACV,CAAC,MAAM,EAAE,MAAM,GAAG;gBAChB,IAAI,EAAE,MAAM,CAAC;gBACb,UAAU,CAAC,EAAE,GAAG,CAAC;gBACjB,KAAK,EAAE,MAAM,CAAC;gBACd,OAAO,EAAE;oBACP,IAAI,EAAE,MAAM,CAAC;oBACb,QAAQ,CAAC,EAAE,MAAM,CAAC;oBAClB,YAAY,CAAC,EAAE,MAAM,CAAC;oBACtB,oBAAoB,CAAC,EAAE,MAAM,CAAC;oBAC9B,QAAQ,EAAE,MAAM,CAAC;oBACjB,EAAE,EAAE,MAAM,CAAC;oBACX,KAAK,EAAE,MAAM,CAAC;oBACd,KAAK,EAAE,MAAM,CAAC;oBACd,IAAI,EAAE,MAAM,CAAC;oBACb,CAAC,EAAE,MAAM,CAAC;oBACV,CAAC,EAAE,MAAM,CAAC;oBACV,CAAC,EAAE,MAAM,CAAC;oBAEV,OAAO,EAAE,MAAM,CAAC;iBACjB,CAAC;aACH,CAAC;SACH,EACD,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,MAAM,GAAG,SAAS,KAC/B,OAAO,CAAC,IAAI,CAAC,CAAC;KACpB,CAAC;CACH,CAksFA;AAMD,wBAAsB,SAAS,CAC7B,QAAQ,EAAE,gBAAgB,EAC1B,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,OAAO,GAClB,OAAO,CAAC,OAAO,CAAC,CAoBlB"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/helpers.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,mBAAmB,EAEpB,MAAM,0BAA0B,CAAC;AAQlC,OAAO,EAAC,SAAS,EAAC,MAAM,0BAA0B,CAAC;AAKnD,OAAO,EAGL,oBAAoB,EAKpB,OAAO,EAKP,oBAAoB,EAMrB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAC,gBAAgB,EAAC,MAAM,kBAAkB,CAAC;AAgBlD,OAAO,EAAC,QAAQ,EAAE,gBAAgB,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAClE,OAAO,EAAC,kBAAkB,EAAC,MAAM,sBAAsB,CAAC;AAiKxD,wBAAgB,UAAU,CACxB,iBAAiB,EAAE,kBAAkB,EACrC,gBAAgB,EAAE,gBAAgB,EAClC,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,QAAQ,CAAC,EAChD,cAAc,EAAE,CACd,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,oBAAoB,EAChC,YAAY,CAAC,EAAE,MAAM,KAClB,OAAO,CAAC,IAAI,CAAC,EAClB,cAAc,EAAE,MAAM,OAAO,EAC7B,WAAW,EAAE,CACX,UAAU,EAAE,mBAAmB,EAC/B,IAAI,CAAC,EAAE,MAAM,EACb,IAAI,CAAC,EAAE,GAAG,KACP,OAAO,CAAC,mBAAmB,CAAC,EACjC,WAAW,EAAE,MAAM,OAAO,CAAC;IACzB,QAAQ,EAAE,SAAS,GAAG,SAAS,CAAC;IAChC,YAAY,EAAE,SAAS,GAAG,SAAS,CAAC;IACpC,oBAAoB,EAAE,SAAS,GAAG,SAAS,CAAC;CAC7C,CAAC,EACF,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,EAC7B,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,GAC3B;IACD,SAAS,EAAE,oBAAoB,CAAC;IAChC,KAAK,EAAE;QACL,2BAA2B,EAAE,CAC3B,UAAU,EAAE;YACV,CAAC,MAAM,EAAE,MAAM,GAAG;gBAChB,IAAI,EAAE,MAAM,CAAC;gBACb,UAAU,CAAC,EAAE,GAAG,CAAC;gBACjB,KAAK,EAAE,MAAM,CAAC;gBACd,OAAO,EAAE;oBACP,IAAI,EAAE,MAAM,CAAC;oBACb,QAAQ,CAAC,EAAE,MAAM,CAAC;oBAClB,YAAY,CAAC,EAAE,MAAM,CAAC;oBACtB,oBAAoB,CAAC,EAAE,MAAM,CAAC;oBAC9B,QAAQ,EAAE,MAAM,CAAC;oBACjB,EAAE,EAAE,MAAM,CAAC;oBACX,KAAK,EAAE,MAAM,CAAC;oBACd,KAAK,EAAE,MAAM,CAAC;oBACd,IAAI,EAAE,MAAM,CAAC;oBACb,CAAC,EAAE,MAAM,CAAC;oBACV,CAAC,EAAE,MAAM,CAAC;oBACV,CAAC,EAAE,MAAM,CAAC;oBAEV,OAAO,EAAE,MAAM,CAAC;iBACjB,CAAC;aACH,CAAC;SACH,EACD,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,MAAM,GAAG,SAAS,KAC/B,OAAO,CAAC,IAAI,CAAC,CAAC;KACpB,CAAC;CACH,CA0gGA;AAMD,wBAAsB,SAAS,CAC7B,QAAQ,EAAE,gBAAgB,EAC1B,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,OAAO,GAClB,OAAO,CAAC,OAAO,CAAC,CAoBlB"}

package/dist/src/helpers.js

@@ -23,6 +23,7 @@ const ProxyAdmin_json_1 = __importDefault(require("../extendedArtifacts/ProxyAdm
 const EIP173Proxy_json_1 = __importDefault(require("../extendedArtifacts/EIP173Proxy.json"));
 const EIP173ProxyWithReceive_json_1 = __importDefault(require("../extendedArtifacts/EIP173ProxyWithReceive.json"));
 const Diamond_json_1 = __importDefault(require("../extendedArtifacts/Diamond.json"));
+const old_diamondbase_json_1 = __importDefault(require("./old_diamondbase.json"));
 const DiamondERC165Init_json_1 = __importDefault(require("../extendedArtifacts/DiamondERC165Init.json"));
 const DiamondCutFacet_json_1 = __importDefault(require("../extendedArtifacts/DiamondCutFacet.json"));
 const DiamondLoupeFacet_json_1 = __importDefault(require("../extendedArtifacts/DiamondLoupeFacet.json"));
@@ -1087,6 +1088,10 @@ Note that in this case, the contract deployment will not behave the same if depl
     }
     async function _deployViaDiamondProxy(name, options) {
         const oldDeployment = await getDeploymentOrNUll(name);
+        if (oldDeployment &&
+            oldDeployment.deployedBytecode === old_diamondbase_json_1.default.deployedByecode) {
+            return _old_deployViaDiamondProxy(name, options);
+        }
         let proxy;
         const deployResult = _checkUpgradeIndex(oldDeployment, options.upgradeIndex);
         if (deployResult) {
@@ -1131,7 +1136,7 @@ Note that in this case, the contract deployment will not behave the same if depl
             });
         }
         facetsSet.push({
-            name: '_DefaultDiamondLoopeFacet',
+            name: '_DefaultDiamondLoupeFacet',
             contract: DiamondLoupeFacet_json_1.default,
             args: [],
             deterministic: true,
@@ -1334,6 +1339,7 @@ Note that in this case, the contract deployment will not behave the same if depl
                     const executionDeployment = await _deployOne(options.execute.contract.name, {
                         from: options.from,
                         contract: options.execute.contract.artifact,
+                        args: options.execute.contract.args,
                         autoMine: options.autoMine,
                         estimateGasExtra: options.estimateGasExtra,
                         estimatedGasLimit: options.estimatedGasLimit,
@@ -1571,16 +1577,7 @@ Note that in this case, the contract deployment will not behave the same if depl
                 if (!executeReceipt) {
                     throw new Error('failed to execute');
                 }
-                const diamondDeployment = {
-                    receipt: executeReceipt,
-                    transactionHash: executeReceipt.transactionHash,
-                    linkedData: options.linkedData,
-                    address: proxy.address,
-                    abi,
-                    facets: facetSnapshot,
-                    diamondCut: facetCuts,
-                    execute: options.execute,
-                };
+                const diamondDeployment = Object.assign(Object.assign({}, oldDeployment), { linkedData: options.linkedData, address: proxy.address, abi, facets: facetSnapshot, diamondCut: facetCuts, execute: options.execute });
                 // TODO reenable history with options
                 if (oldDeployment.history) {
                     diamondDeployment.history = diamondDeployment.history
@@ -2087,6 +2084,257 @@ data: ${data}
         return deploy(name, options);
     };
     // ////////////////////////////////////////////////////////////////////
+    async function _old_deployViaDiamondProxy(name, options) {
+        if (options.log) {
+            log(`old diamond...`);
+        }
+        const oldDeployment = await getDeploymentOrNUll(name);
+        let proxy;
+        const deployResult = _checkUpgradeIndex(oldDeployment, options.upgradeIndex);
+        if (deployResult) {
+            return deployResult;
+        }
+        if (options.deterministicSalt) {
+            throw new Error(`old diamonds do not support determinsitc deployment`);
+            // need to compute the resulting address accurately
+        }
+        const proxyName = name + '_DiamondProxy';
+        const { address: owner, hardwareWallet } = getDiamondOwner(options);
+        const newSelectors = [];
+        const facetSnapshot = [];
+        const oldFacets = [];
+        const selectorToNotTouch = {};
+        for (const selector of [
+            '0xcdffacc6',
+            '0x52ef6b2c',
+            '0xadfca15e',
+            '0x7a0ed627',
+            '0x01ffc9a7',
+            '0x1f931c1c',
+            '0xf2fde38b',
+            '0x8da5cb5b',
+        ]) {
+            selectorToNotTouch[selector] = true;
+        }
+        if (oldDeployment) {
+            proxy = await getDeployment(proxyName);
+            const diamondProxy = new contracts_1.Contract(proxy.address, proxy.abi, provider);
+            const currentFacets = await diamondProxy.facets();
+            for (const currentFacet of currentFacets) {
+                oldFacets.push(currentFacet);
+                // ensure DiamondLoupeFacet, OwnershipFacet and DiamondCutFacet are kept // TODO options to delete cut them out?
+                if (findAll([
+                    '0xcdffacc6',
+                    '0x52ef6b2c',
+                    '0xadfca15e',
+                    '0x7a0ed627',
+                    '0x01ffc9a7',
+                ], currentFacet.functionSelectors) || // Loupe
+                    currentFacet.functionSelectors[0] === '0x1f931c1c' || // DiamoncCut
+                    findAll(['0xf2fde38b', '0x8da5cb5b'], currentFacet.functionSelectors) // ERC173
+                ) {
+                    facetSnapshot.push(currentFacet);
+                    newSelectors.push(...currentFacet.functionSelectors);
+                }
+            }
+        }
+        else {
+            throw new Error(`old diamond deployments are now disabled`);
+        }
+        // console.log({ oldFacets: JSON.stringify(oldFacets, null, "  ") });
+        let changesDetected = !oldDeployment;
+        let abi = old_diamondbase_json_1.default.abi.concat([]);
+        const facetCuts = [];
+        for (const facet of options.facets) {
+            let facetName;
+            let artifact;
+            let linkedData = options.linkedData;
+            let libraries = options.libraries;
+            let facetArgs = options.facetsArgs;
+            let argsSpecific = false;
+            if (typeof facet === 'string') {
+                artifact = await partialExtension.getExtendedArtifact(facet);
+                facetName = facet;
+            }
+            else {
+                if (facet.linkedData) {
+                    linkedData = facet.linkedData;
+                }
+                if (facet.libraries) {
+                    libraries = facet.libraries;
+                }
+                if (facet.args) {
+                    facetArgs = facet.args;
+                    argsSpecific = true;
+                }
+                if (facet.contract) {
+                    if (typeof facet.contract === 'string') {
+                        artifact = await partialExtension.getExtendedArtifact(facet.contract);
+                    }
+                    else {
+                        artifact = facet.contract;
+                    }
+                }
+                else {
+                    if (!facet.name) {
+                        throw new Error(`no name , not contract is specified for facet, cannot proceed`);
+                    }
+                    artifact = await partialExtension.getExtendedArtifact(facet.name);
+                }
+                facetName = facet.name;
+                if (!facetName) {
+                    if (typeof facet.contract === 'string') {
+                        facetName = name + '_facet_' + facet.contract;
+                    }
+                    else {
+                        throw new Error(`facet has no name, please specify one`);
+                    }
+                }
+            }
+            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 = [];
+            }
+            abi = utils_1.mergeABIs([abi, artifact.abi], {
+                check: true,
+                skipSupportsInterface: false,
+            });
+            // TODO allow facet to be named so multiple version could coexist
+            const implementation = await _deployOne(facetName, {
+                contract: artifact,
+                from: options.from,
+                autoMine: options.autoMine,
+                estimateGasExtra: options.estimateGasExtra,
+                estimatedGasLimit: options.estimatedGasLimit,
+                gasPrice: options.gasPrice,
+                maxFeePerGas: options.maxFeePerGas,
+                maxPriorityFeePerGas: options.maxPriorityFeePerGas,
+                log: options.log,
+                // deterministicDeployment: options.deterministicDeployment, // todo ?
+                libraries,
+                linkedData,
+                args: facetArgs,
+            });
+            if (implementation.newlyDeployed) {
+                // console.log(`facet ${facet} deployed at ${implementation.address}`);
+                const newFacet = {
+                    facetAddress: implementation.address,
+                    functionSelectors: sigsFromABI(implementation.abi),
+                };
+                facetSnapshot.push(newFacet);
+                newSelectors.push(...newFacet.functionSelectors);
+            }
+            else {
+                const oldImpl = await getDeployment(facetName);
+                const newFacet = {
+                    facetAddress: oldImpl.address,
+                    functionSelectors: sigsFromABI(oldImpl.abi),
+                };
+                facetSnapshot.push(newFacet);
+                newSelectors.push(...newFacet.functionSelectors);
+            }
+        }
+        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) {
+                if (oldSelectors.indexOf(selector) > 0) {
+                    if (oldSelectorsFacetAddress[selector].toLowerCase() !==
+                        newFacet.facetAddress.toLowerCase() &&
+                        !selectorToNotTouch[selector]) {
+                        selectorsToReplace.push(selector);
+                    }
+                }
+                else {
+                    if (!selectorToNotTouch[selector]) {
+                        selectorsToAdd.push(selector);
+                    }
+                }
+            }
+            if (selectorsToReplace.length > 0) {
+                changesDetected = true;
+                facetCuts.push({
+                    facetAddress: newFacet.facetAddress,
+                    functionSelectors: selectorsToReplace,
+                    action: types_1.FacetCutAction.Replace,
+                });
+            }
+            if (selectorsToAdd.length > 0) {
+                changesDetected = true;
+                facetCuts.push({
+                    facetAddress: newFacet.facetAddress,
+                    functionSelectors: selectorsToAdd,
+                    action: types_1.FacetCutAction.Add,
+                });
+            }
+        }
+        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: types_1.FacetCutAction.Remove,
+            });
+        }
+        let data = '0x';
+        if (options.execute) {
+            const diamondContract = new contracts_1.Contract('0x0000000000000000000000000000000000000001', abi);
+            const txData = await diamondContract.populateTransaction[options.execute.methodName](...options.execute.args);
+            data = txData.data || '0x';
+        }
+        if (changesDetected) {
+            if (!proxy) {
+                throw new Error(`no proxy found: old diamond deployments are now disabled`);
+            }
+            else {
+                const currentOwner = await read(proxyName, 'owner');
+                if (currentOwner.toLowerCase() !== owner.toLowerCase()) {
+                    throw new Error('To change owner, you need to call `transferOwnership`');
+                }
+                if (currentOwner === constants_1.AddressZero) {
+                    throw new Error('The Diamond belongs to no-one. It cannot be upgraded anymore');
+                }
+                const executeReceipt = await execute(name, Object.assign(Object.assign({}, options), { from: currentOwner }), 'diamondCut', facetCuts, data === '0x'
+                    ? '0x0000000000000000000000000000000000000000'
+                    : proxy.address, data);
+                if (!executeReceipt) {
+                    throw new Error('failed to execute');
+                }
+                const diamondDeployment = Object.assign(Object.assign({}, oldDeployment), { linkedData: options.linkedData, address: proxy.address, abi, facets: facetSnapshot, diamondCut: facetCuts, execute: options.execute });
+                // TODO reenable history with options
+                if (oldDeployment.history) {
+                    diamondDeployment.history = diamondDeployment.history
+                        ? diamondDeployment.history.concat([oldDeployment])
+                        : [oldDeployment];
+                }
+                await saveDeployment(name, diamondDeployment);
+            }
+            const deployment = await partialExtension.get(name);
+            return Object.assign(Object.assign({}, deployment), { newlyDeployed: true });
+        }
+        else {
+            const oldDeployment = await partialExtension.get(name);
+            const proxiedDeployment = Object.assign(Object.assign({}, oldDeployment), { facets: facetSnapshot, diamondCut: facetCuts, abi, execute: options.execute });
+            await saveDeployment(name, proxiedDeployment);
+            const deployment = await partialExtension.get(name);
+            return Object.assign(Object.assign({}, deployment), { newlyDeployed: false });
+        }
+    }
     return { extension, utils };
 }
 exports.addHelpers = addHelpers;