From c3bc5ed9954a023576599410c13e89ca41c05db9 Mon Sep 17 00:00:00 2001
From: Daniel Lima <daniel.lima@orium.network>
Date: Thu, 2 May 2024 15:47:46 -0300
Subject: [PATCH 1/2] Fix: Update deployment payload contract name

---
 tasks/deploy-proxy.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tasks/deploy-proxy.ts b/tasks/deploy-proxy.ts
index 0bea4eec..921e20d1 100644
--- a/tasks/deploy-proxy.ts
+++ b/tasks/deploy-proxy.ts
@@ -368,7 +368,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 = {

From cc34be9059bfddc3b06130e3557725d2bd56fb85 Mon Sep 17 00:00:00 2001
From: Daniel Lima <daniel.lima@orium.network>
Date: Thu, 2 May 2024 16:02:59 -0300
Subject: [PATCH 2/2] Fix: Add extension abis to deployment payload

---
 tasks/deploy-proxy.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tasks/deploy-proxy.ts b/tasks/deploy-proxy.ts
index 921e20d1..412c4b27 100644
--- 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);
@@ -383,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,
                                 };