Merge pull request #121 from G7DAO/fix/deployment-script

Fix: Update deployment payload contract name
G7DAO · May 2, 2024 · e21e845 · e21e845
2 parents 13d65e8 + cc34be9
commit e21e845
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/tasks/deploy-proxy.ts b/tasks/deploy-proxy.ts
@@ -304,12 +304,13 @@ task('deploy-proxy', 'Deploys Smart contracts with proxy')
                             metadataURI: extension.metadata.metadataURI,
                             implementation: deployedExtensionContract.contractAddress,
                         };
+                        const abi = deployedExtensionContract.contractAbi;
 
                         const contractInstance = await hre.ethers.getContractAt(
                             extension.contractFileName,
                             deployedExtensionContract.contractAddress
                         );
-
+                        
                         let functions: ExtensionFunction[] = [];
 
                         for (const func of extension.functionsToInclude) {
@@ -323,6 +324,7 @@ task('deploy-proxy', 'Deploys Smart contracts with proxy')
                         const extensionDeployed = {
                             metadata,
                             functions,
+                            abi,
                         };
 
                         deployedExtensions.push(extensionDeployed);
@@ -368,7 +370,8 @@ task('deploy-proxy', 'Deploys Smart contracts with proxy')
                             );
 
                             const proxyDeployment = await deployOne(hre, proxyContract, tenant, implementationContract);
-
+
+                            proxyDeployment.name = `${proxyDeployment.name}${deployedImplementation.name}`;
                             proxyDeployment.upgradable = true;
                             proxyDeployment.proxyType = PROXY_CONTRACT_TYPE.EIP1967;
                             proxyDeployment.proxy = {
@@ -382,7 +385,7 @@ task('deploy-proxy', 'Deploys Smart contracts with proxy')
                             };
                             proxyDeployment.extensions = deployedExtensions.map((extension) => {
                                 return {
-                                    abi: extension.metadata,
+                                    abi: extension.abi,
                                     address: extension.metadata.implementation,
                                     functions: extension.functions,
                                 };