From 4cf8cd4f76a8048c84724345a094410ef17404fd Mon Sep 17 00:00:00 2001
From: Rekard0 <5880388+Rekard0@users.noreply.github.com>
Date: Wed, 26 Feb 2025 15:08:19 +0100
Subject: [PATCH] remove batches used for Agung

---
 .../deploy/new/00_management-dao/00_management-dao.ts     | 2 +-
 .../00_management-dao/01_management-dao-permissions.ts    | 2 +-
 .../new/00_management-dao/02_management-dao_conclude.ts   | 8 +-------
 .../deploy/new/00_management-dao/20_set-dao-permission.ts | 2 +-
 .../deploy/new/00_management-dao/99_verify_step.ts        | 2 +-
 .../contracts/deploy/new/10_framework/00_ens_registry.ts  | 2 +-
 .../deploy/new/10_framework/01_ens_subdomains.ts          | 2 +-
 .../new/10_framework/02_ens_subdomain_registrars.ts       | 2 +-
 .../contracts/deploy/new/10_framework/09_ens_conclude.ts  | 1 -
 .../contracts/deploy/new/10_framework/10_dao-registry.ts  | 2 +-
 .../deploy/new/10_framework/11_dao-registry_conclude.ts   | 2 +-
 .../deploy/new/10_framework/20_plugin-repo-registry.ts    | 2 +-
 .../new/10_framework/21_plugin-repo-registry_conclude.ts  | 2 +-
 .../contracts/deploy/new/10_framework/30_repo-factory.ts  | 2 +-
 .../deploy/new/10_framework/31_repo-factory_conclude.ts   | 2 +-
 .../deploy/new/10_framework/40_plugin_setup_processor.ts  | 2 +-
 .../10_framework/41_plugin-setup-processor_conclude.ts    | 2 +-
 .../contracts/deploy/new/10_framework/50_dao-factory.ts   | 2 +-
 .../deploy/new/10_framework/51_dao-factory-conclude.ts    | 2 +-
 .../deploy/new/10_framework/52_global_executor.ts         | 2 +-
 .../deploy/new/10_framework/53_deploy-placeholder.ts      | 2 +-
 .../deploy/new/20_permissions/00_ens-permissions.ts       | 2 +-
 .../new/20_permissions/10_dao-registry-permissions.ts     | 2 +-
 .../new/20_permissions/20_plugin-registrty-permissions.ts | 2 +-
 packages/contracts/deploy/new/20_permissions/99_verify.ts | 1 -
 .../40_finalize-management-dao/00_grant-permissions.ts    | 2 +-
 .../20_register-management-dao-on-dao-registry.ts         | 2 +-
 .../40_finalize-management-dao/40_revoke-permissions.ts   | 2 +-
 .../new/40_finalize-management-dao/99_verify_step.ts      | 2 +-
 .../99_conclude/00_save-contract-addresses.ts             | 2 +-
 30 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/packages/contracts/deploy/new/00_management-dao/00_management-dao.ts b/packages/contracts/deploy/new/00_management-dao/00_management-dao.ts
index 57db50f4b..9ccef0ca0 100644
--- a/packages/contracts/deploy/new/00_management-dao/00_management-dao.ts
+++ b/packages/contracts/deploy/new/00_management-dao/00_management-dao.ts
@@ -51,5 +51,5 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   });
 };
 export default func;
-func.tags = ['New', 'ManagementDao', 'Batch-1'];
+func.tags = ['New', 'ManagementDao'];
 func.dependencies = ['Env'];
diff --git a/packages/contracts/deploy/new/00_management-dao/01_management-dao-permissions.ts b/packages/contracts/deploy/new/00_management-dao/01_management-dao-permissions.ts
index f7e900700..0d7c6d37d 100644
--- a/packages/contracts/deploy/new/00_management-dao/01_management-dao-permissions.ts
+++ b/packages/contracts/deploy/new/00_management-dao/01_management-dao-permissions.ts
@@ -32,4 +32,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   ]);
 };
 export default func;
-func.tags = ['New', 'ManagementDaoPermissions', 'Batch-1'];
+func.tags = ['New', 'ManagementDaoPermissions'];
diff --git a/packages/contracts/deploy/new/00_management-dao/02_management-dao_conclude.ts b/packages/contracts/deploy/new/00_management-dao/02_management-dao_conclude.ts
index c3bed4adf..df3078ea7 100644
--- a/packages/contracts/deploy/new/00_management-dao/02_management-dao_conclude.ts
+++ b/packages/contracts/deploy/new/00_management-dao/02_management-dao_conclude.ts
@@ -13,10 +13,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 };
 
 export default func;
-func.tags = [
-  'New',
-  'ManagementDao',
-  'ManagementDaoPermissions',
-  'Verify',
-  'Batch-1',
-];
+func.tags = ['New', 'ManagementDao', 'ManagementDaoPermissions', 'Verify'];
diff --git a/packages/contracts/deploy/new/00_management-dao/20_set-dao-permission.ts b/packages/contracts/deploy/new/00_management-dao/20_set-dao-permission.ts
index fb0639e76..586387df6 100644
--- a/packages/contracts/deploy/new/00_management-dao/20_set-dao-permission.ts
+++ b/packages/contracts/deploy/new/00_management-dao/20_set-dao-permission.ts
@@ -38,4 +38,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   await managePermissions(managementDaoContract, permissions);
 };
 export default func;
-func.tags = ['New', 'SetManagementDaoPermissions', 'Batch-1'];
+func.tags = ['New', 'SetManagementDaoPermissions'];
diff --git a/packages/contracts/deploy/new/00_management-dao/99_verify_step.ts b/packages/contracts/deploy/new/00_management-dao/99_verify_step.ts
index 3f6e47c90..5a12fb708 100644
--- a/packages/contracts/deploy/new/00_management-dao/99_verify_step.ts
+++ b/packages/contracts/deploy/new/00_management-dao/99_verify_step.ts
@@ -48,4 +48,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   console.log('Management DAO deployment verified');
 };
 export default func;
-func.tags = ['New', 'ManagementDao', 'SetDAOPermissions', 'Batch-1'];
+func.tags = ['New', 'ManagementDao', 'SetDAOPermissions'];
diff --git a/packages/contracts/deploy/new/10_framework/00_ens_registry.ts b/packages/contracts/deploy/new/10_framework/00_ens_registry.ts
index d265c771c..987e71e22 100644
--- a/packages/contracts/deploy/new/10_framework/00_ens_registry.ts
+++ b/packages/contracts/deploy/new/10_framework/00_ens_registry.ts
@@ -20,4 +20,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   }
 };
 export default func;
-func.tags = ['New', 'ENSRegistry', 'Batch-2'];
+func.tags = ['New', 'ENSRegistry'];
diff --git a/packages/contracts/deploy/new/10_framework/01_ens_subdomains.ts b/packages/contracts/deploy/new/10_framework/01_ens_subdomains.ts
index ec6df1dc1..b1eb9bdf4 100644
--- a/packages/contracts/deploy/new/10_framework/01_ens_subdomains.ts
+++ b/packages/contracts/deploy/new/10_framework/01_ens_subdomains.ts
@@ -96,4 +96,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   );
 };
 export default func;
-func.tags = ['New', 'ENSSubdomains', 'Batch-3'];
+func.tags = ['New', 'ENSSubdomains'];
diff --git a/packages/contracts/deploy/new/10_framework/02_ens_subdomain_registrars.ts b/packages/contracts/deploy/new/10_framework/02_ens_subdomain_registrars.ts
index 40305912b..003b5018d 100644
--- a/packages/contracts/deploy/new/10_framework/02_ens_subdomain_registrars.ts
+++ b/packages/contracts/deploy/new/10_framework/02_ens_subdomain_registrars.ts
@@ -120,4 +120,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   await tx.wait();
 };
 export default func;
-func.tags = ['New', 'ENSSubdomainRegistrars', 'Batch-4'];
+func.tags = ['New', 'ENSSubdomainRegistrars'];
diff --git a/packages/contracts/deploy/new/10_framework/09_ens_conclude.ts b/packages/contracts/deploy/new/10_framework/09_ens_conclude.ts
index 5a430a8e6..7c213a5ea 100644
--- a/packages/contracts/deploy/new/10_framework/09_ens_conclude.ts
+++ b/packages/contracts/deploy/new/10_framework/09_ens_conclude.ts
@@ -51,5 +51,4 @@ func.tags = [
   'ENSSubdomains',
   'ENSSubdomainRegistrars',
   'Verify',
-  'Batch-4',
 ];
diff --git a/packages/contracts/deploy/new/10_framework/10_dao-registry.ts b/packages/contracts/deploy/new/10_framework/10_dao-registry.ts
index 0a522a634..01660a7d5 100644
--- a/packages/contracts/deploy/new/10_framework/10_dao-registry.ts
+++ b/packages/contracts/deploy/new/10_framework/10_dao-registry.ts
@@ -39,4 +39,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   });
 };
 export default func;
-func.tags = ['New', 'DAORegistry', 'Batch-5'];
+func.tags = ['New', 'DAORegistry'];
diff --git a/packages/contracts/deploy/new/10_framework/11_dao-registry_conclude.ts b/packages/contracts/deploy/new/10_framework/11_dao-registry_conclude.ts
index 439828535..bb6eca059 100644
--- a/packages/contracts/deploy/new/10_framework/11_dao-registry_conclude.ts
+++ b/packages/contracts/deploy/new/10_framework/11_dao-registry_conclude.ts
@@ -14,4 +14,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 };
 
 export default func;
-func.tags = ['New', 'DAORegistry', 'Verify', 'Batch-5'];
+func.tags = ['New', 'DAORegistry', 'Verify'];
diff --git a/packages/contracts/deploy/new/10_framework/20_plugin-repo-registry.ts b/packages/contracts/deploy/new/10_framework/20_plugin-repo-registry.ts
index 29bd2713e..32f6b96ff 100644
--- a/packages/contracts/deploy/new/10_framework/20_plugin-repo-registry.ts
+++ b/packages/contracts/deploy/new/10_framework/20_plugin-repo-registry.ts
@@ -40,4 +40,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 };
 export default func;
 // func.runAtTheEnd = true;
-func.tags = ['New', 'PluginRepoRegistry', 'Batch-6'];
+func.tags = ['New', 'PluginRepoRegistry'];
diff --git a/packages/contracts/deploy/new/10_framework/21_plugin-repo-registry_conclude.ts b/packages/contracts/deploy/new/10_framework/21_plugin-repo-registry_conclude.ts
index a83d3ea9b..9d0264c70 100644
--- a/packages/contracts/deploy/new/10_framework/21_plugin-repo-registry_conclude.ts
+++ b/packages/contracts/deploy/new/10_framework/21_plugin-repo-registry_conclude.ts
@@ -17,4 +17,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 };
 
 export default func;
-func.tags = ['New', 'PluginRepoRegistry', 'Verify', 'Batch-6'];
+func.tags = ['New', 'PluginRepoRegistry', 'Verify'];
diff --git a/packages/contracts/deploy/new/10_framework/30_repo-factory.ts b/packages/contracts/deploy/new/10_framework/30_repo-factory.ts
index 4c19807b8..b35771d38 100644
--- a/packages/contracts/deploy/new/10_framework/30_repo-factory.ts
+++ b/packages/contracts/deploy/new/10_framework/30_repo-factory.ts
@@ -22,4 +22,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   });
 };
 export default func;
-func.tags = ['New', 'PluginRepoFactory', 'Batch-7'];
+func.tags = ['New', 'PluginRepoFactory'];
diff --git a/packages/contracts/deploy/new/10_framework/31_repo-factory_conclude.ts b/packages/contracts/deploy/new/10_framework/31_repo-factory_conclude.ts
index 0c5c0f90a..502e96bd1 100644
--- a/packages/contracts/deploy/new/10_framework/31_repo-factory_conclude.ts
+++ b/packages/contracts/deploy/new/10_framework/31_repo-factory_conclude.ts
@@ -29,4 +29,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 };
 
 export default func;
-func.tags = ['New', 'PluginRepoFactory', 'Verify', 'Batch-7'];
+func.tags = ['New', 'PluginRepoFactory', 'Verify'];
diff --git a/packages/contracts/deploy/new/10_framework/40_plugin_setup_processor.ts b/packages/contracts/deploy/new/10_framework/40_plugin_setup_processor.ts
index 8186f074c..32672f10f 100644
--- a/packages/contracts/deploy/new/10_framework/40_plugin_setup_processor.ts
+++ b/packages/contracts/deploy/new/10_framework/40_plugin_setup_processor.ts
@@ -22,4 +22,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   });
 };
 export default func;
-func.tags = ['New', 'PluginSetupProcessor', 'Batch-8'];
+func.tags = ['New', 'PluginSetupProcessor'];
diff --git a/packages/contracts/deploy/new/10_framework/41_plugin-setup-processor_conclude.ts b/packages/contracts/deploy/new/10_framework/41_plugin-setup-processor_conclude.ts
index c93916347..e4839811d 100644
--- a/packages/contracts/deploy/new/10_framework/41_plugin-setup-processor_conclude.ts
+++ b/packages/contracts/deploy/new/10_framework/41_plugin-setup-processor_conclude.ts
@@ -11,4 +11,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 };
 
 export default func;
-func.tags = ['New', 'PluginSetupProcessor', 'Verify', 'Batch-8'];
+func.tags = ['New', 'PluginSetupProcessor', 'Verify'];
diff --git a/packages/contracts/deploy/new/10_framework/50_dao-factory.ts b/packages/contracts/deploy/new/10_framework/50_dao-factory.ts
index 525debb0b..3281ff6a8 100644
--- a/packages/contracts/deploy/new/10_framework/50_dao-factory.ts
+++ b/packages/contracts/deploy/new/10_framework/50_dao-factory.ts
@@ -25,4 +25,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   });
 };
 export default func;
-func.tags = ['New', 'DAOFactory', 'Batch-9'];
+func.tags = ['New', 'DAOFactory'];
diff --git a/packages/contracts/deploy/new/10_framework/51_dao-factory-conclude.ts b/packages/contracts/deploy/new/10_framework/51_dao-factory-conclude.ts
index fb8f160f2..ab773afb0 100644
--- a/packages/contracts/deploy/new/10_framework/51_dao-factory-conclude.ts
+++ b/packages/contracts/deploy/new/10_framework/51_dao-factory-conclude.ts
@@ -26,4 +26,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 };
 
 export default func;
-func.tags = ['New', 'DAOFactory', 'Verify', 'Batch-9'];
+func.tags = ['New', 'DAOFactory', 'Verify'];
diff --git a/packages/contracts/deploy/new/10_framework/52_global_executor.ts b/packages/contracts/deploy/new/10_framework/52_global_executor.ts
index 863a01fbd..f5bc4091e 100644
--- a/packages/contracts/deploy/new/10_framework/52_global_executor.ts
+++ b/packages/contracts/deploy/new/10_framework/52_global_executor.ts
@@ -19,4 +19,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   });
 };
 export default func;
-func.tags = ['New', 'GlobalExecutor', 'Batch-10'];
+func.tags = ['New', 'GlobalExecutor'];
diff --git a/packages/contracts/deploy/new/10_framework/53_deploy-placeholder.ts b/packages/contracts/deploy/new/10_framework/53_deploy-placeholder.ts
index a639b8fbe..86f9f1272 100644
--- a/packages/contracts/deploy/new/10_framework/53_deploy-placeholder.ts
+++ b/packages/contracts/deploy/new/10_framework/53_deploy-placeholder.ts
@@ -19,4 +19,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   });
 };
 export default func;
-func.tags = ['New', 'PlaceholderSetup', 'Batch-10'];
+func.tags = ['New', 'PlaceholderSetup'];
diff --git a/packages/contracts/deploy/new/20_permissions/00_ens-permissions.ts b/packages/contracts/deploy/new/20_permissions/00_ens-permissions.ts
index 5ecde7c0c..d12954bf4 100644
--- a/packages/contracts/deploy/new/20_permissions/00_ens-permissions.ts
+++ b/packages/contracts/deploy/new/20_permissions/00_ens-permissions.ts
@@ -88,4 +88,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   await managePermissions(managementDaoContract, grantPermissions);
 };
 export default func;
-func.tags = ['New', 'ENS_Permissions', 'Batch-12'];
+func.tags = ['New', 'ENS_Permissions'];
diff --git a/packages/contracts/deploy/new/20_permissions/10_dao-registry-permissions.ts b/packages/contracts/deploy/new/20_permissions/10_dao-registry-permissions.ts
index 93493316b..6d5ab1f76 100644
--- a/packages/contracts/deploy/new/20_permissions/10_dao-registry-permissions.ts
+++ b/packages/contracts/deploy/new/20_permissions/10_dao-registry-permissions.ts
@@ -45,4 +45,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   await managePermissions(managementDaoContract, grantPermissions);
 };
 export default func;
-func.tags = ['New', 'DAO_Registry_Permissions', 'Batch-13'];
+func.tags = ['New', 'DAO_Registry_Permissions'];
diff --git a/packages/contracts/deploy/new/20_permissions/20_plugin-registrty-permissions.ts b/packages/contracts/deploy/new/20_permissions/20_plugin-registrty-permissions.ts
index c342e459c..077af70fb 100644
--- a/packages/contracts/deploy/new/20_permissions/20_plugin-registrty-permissions.ts
+++ b/packages/contracts/deploy/new/20_permissions/20_plugin-registrty-permissions.ts
@@ -57,4 +57,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   await managePermissions(managementDaoContract, grantPermissions);
 };
 export default func;
-func.tags = ['New', 'Plugin_Registry_Permissions', 'Batch-14'];
+func.tags = ['New', 'Plugin_Registry_Permissions'];
diff --git a/packages/contracts/deploy/new/20_permissions/99_verify.ts b/packages/contracts/deploy/new/20_permissions/99_verify.ts
index 8c247eb8c..f60a6a57b 100644
--- a/packages/contracts/deploy/new/20_permissions/99_verify.ts
+++ b/packages/contracts/deploy/new/20_permissions/99_verify.ts
@@ -105,5 +105,4 @@ func.tags = [
   'ENS_Permissions',
   'DAO_Registry_Permissions',
   'Plugin_Registry_Permissions',
-  'Batch-15',
 ];
diff --git a/packages/contracts/deploy/new/40_finalize-management-dao/00_grant-permissions.ts b/packages/contracts/deploy/new/40_finalize-management-dao/00_grant-permissions.ts
index d1d79489a..565b9239b 100644
--- a/packages/contracts/deploy/new/40_finalize-management-dao/00_grant-permissions.ts
+++ b/packages/contracts/deploy/new/40_finalize-management-dao/00_grant-permissions.ts
@@ -46,4 +46,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   await managePermissions(managementDaoContract, grantPermissions);
 };
 export default func;
-func.tags = ['New', 'RegisterManagementDAO', 'Batch-16'];
+func.tags = ['New', 'RegisterManagementDAO'];
diff --git a/packages/contracts/deploy/new/40_finalize-management-dao/20_register-management-dao-on-dao-registry.ts b/packages/contracts/deploy/new/40_finalize-management-dao/20_register-management-dao-on-dao-registry.ts
index 7b5211eca..9dc23c84f 100644
--- a/packages/contracts/deploy/new/40_finalize-management-dao/20_register-management-dao-on-dao-registry.ts
+++ b/packages/contracts/deploy/new/40_finalize-management-dao/20_register-management-dao-on-dao-registry.ts
@@ -104,4 +104,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   }
 };
 export default func;
-func.tags = ['New', 'RegisterManagementDAO', 'Batch-17'];
+func.tags = ['New', 'RegisterManagementDAO'];
diff --git a/packages/contracts/deploy/new/40_finalize-management-dao/40_revoke-permissions.ts b/packages/contracts/deploy/new/40_finalize-management-dao/40_revoke-permissions.ts
index 494143fbf..e61350b27 100644
--- a/packages/contracts/deploy/new/40_finalize-management-dao/40_revoke-permissions.ts
+++ b/packages/contracts/deploy/new/40_finalize-management-dao/40_revoke-permissions.ts
@@ -64,4 +64,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   await managePermissions(managementDaoContract, revokePermissions);
 };
 export default func;
-func.tags = ['New', 'RevokeManagementPermissionsDAO', 'Batch-18'];
+func.tags = ['New', 'RevokeManagementPermissionsDAO'];
diff --git a/packages/contracts/deploy/new/40_finalize-management-dao/99_verify_step.ts b/packages/contracts/deploy/new/40_finalize-management-dao/99_verify_step.ts
index ca6fa61c0..bfc4c60f4 100644
--- a/packages/contracts/deploy/new/40_finalize-management-dao/99_verify_step.ts
+++ b/packages/contracts/deploy/new/40_finalize-management-dao/99_verify_step.ts
@@ -70,4 +70,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   console.log('Finalizing Management DAO verified');
 };
 export default func;
-func.tags = ['New', 'RegisterManagementDAO', 'Batch-19'];
+func.tags = ['New', 'RegisterManagementDAO'];
diff --git a/packages/contracts/deploy/verification/99_conclude/00_save-contract-addresses.ts b/packages/contracts/deploy/verification/99_conclude/00_save-contract-addresses.ts
index da671d3fc..20782b6aa 100644
--- a/packages/contracts/deploy/verification/99_conclude/00_save-contract-addresses.ts
+++ b/packages/contracts/deploy/verification/99_conclude/00_save-contract-addresses.ts
@@ -50,5 +50,5 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   await fs.writeFile('deployed_contracts.json', JSON.stringify(storeInfo));
 };
 export default func;
-func.tags = ['New', 'Conclude', 'ConcludeEnd', 'Batch-20'];
+func.tags = ['New', 'Conclude', 'ConcludeEnd'];
 func.runAtTheEnd = true;