chore(evm): cleanup deploy addresses

boostxyz · Dec 16, 2024 · d0c2f72 · d0c2f72
1 parent a5328f9
commit d0c2f72
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 44 deletions.
diff --git a/packages/evm/deploys/11155111.json b/packages/evm/deploys/11155111.json
@@ -1,24 +1,17 @@
 {
   "AllowListIncentive": "0xCB74EdD24917238c98e7c6d20B047C6D7e0feDdc",
-  "AllowListIncentive_2": "0xCB74EdD24917238c98e7c6d20B047C6D7e0feDdc",
   "BoostCore": "0xDCFFcE9d8185706780A46Cf04D9c6b86b3451497",
   "BoostRegistry": "0x54aBB00F12755Be99729E50dade1BA62c75F8879",
-  "CGDAIncentive": "0xAE1B4db43206c20B611329452f0281DF155EfbF7",
-  "CGDAIncentive_2": "0x9Ed41B9834d6865092520D34ee75292242d3fA56",
-  "ERC20Incentive": "0x3Ecf866C33BcB2DEc4A85b3298391c0f70d645AA",
-  "ERC20Incentive_2": "0x775c30cc9f5A1a7AAf4dFe2B1994Dda5F4586F15",
-  "ERC20PeggedIncentive": "0x0f87d2D3DD967916382cD740C403Fb4E414371e9",
-  "ERC20PeggedIncentive_2": "0x64DFAE63662107c9C68589c726991790D00Fbc29",
-  "ERC20VariableCriteriaIncentive": "0x7cdb385Ce8F0A35008aaA8B776b566044bca8Ca7",
-  "ERC20VariableCriteriaIncentive_2": "0xE7763684b43bE4491A93469aA5D7868591343dEa",
-  "ERC20VariableIncentive": "0x8cD24299D40c76f33065dE6eD4ffAB3d86Db6950",
-  "ERC20VariableIncentive_2": "0xC502d89B01b0137327adC0bd393fCee2dE6EA6d0",
+  "CGDAIncentive": "0x9Ed41B9834d6865092520D34ee75292242d3fA56",
+  "ERC20Incentive": "0x775c30cc9f5A1a7AAf4dFe2B1994Dda5F4586F15",
+  "ERC20PeggedIncentive": "0x64DFAE63662107c9C68589c726991790D00Fbc29",
+  "ERC20VariableCriteriaIncentive": "0xE7763684b43bE4491A93469aA5D7868591343dEa",
+  "ERC20VariableIncentive": "0xC502d89B01b0137327adC0bd393fCee2dE6EA6d0",
   "EventAction": "0xF1c51f679A250a542c38ed45fd5B6D050648669E",
   "ManagedBudget": "0xf109BAFC51aA2a78C831e5460dEDbDf68E866976",
   "ManagedBudgetWithFees": "0x18C217895bd8f1d8aD4F26844aAb5957Eb61C2bA",
   "OpenAllowList": "0xEe55C17D2EDBaB27603eB0d0C753c8A173ba7Ed6",
   "PointsIncentive": "0xC94a7785fDA51B849f2E781e112A4353F315e057",
-  "PointsIncentive_2": "0xC94a7785fDA51B849f2E781e112A4353F315e057",
   "SignerValidator": "0x1FC4208467B485f841D1B8AaDbDBBa987bD81a82",
   "SimpleAllowList": "0xa75E05550D6D3A7C6E960Ac8f8c4155fC64c12eF",
   "SimpleDenyList": "0x01B1dB35a5f91080c7518d917aE124E863abB0EB"

diff --git a/packages/evm/deploys/8453.json b/packages/evm/deploys/8453.json
@@ -1,24 +1,17 @@
 {
   "AllowListIncentive": "0xCB74EdD24917238c98e7c6d20B047C6D7e0feDdc",
-  "AllowListIncentive_2": "0xCB74EdD24917238c98e7c6d20B047C6D7e0feDdc",
   "BoostCore": "0xDCFFcE9d8185706780A46Cf04D9c6b86b3451497",
   "BoostRegistry": "0x54aBB00F12755Be99729E50dade1BA62c75F8879",
-  "CGDAIncentive": "0xAE1B4db43206c20B611329452f0281DF155EfbF7",
-  "CGDAIncentive_2": "0x9Ed41B9834d6865092520D34ee75292242d3fA56",
-  "ERC20Incentive": "0x3Ecf866C33BcB2DEc4A85b3298391c0f70d645AA",
-  "ERC20Incentive_2": "0x775c30cc9f5A1a7AAf4dFe2B1994Dda5F4586F15",
-  "ERC20PeggedIncentive": "0x0f87d2D3DD967916382cD740C403Fb4E414371e9",
-  "ERC20PeggedIncentive_2": "0x64DFAE63662107c9C68589c726991790D00Fbc29",
-  "ERC20VariableCriteriaIncentive": "0x7cdb385Ce8F0A35008aaA8B776b566044bca8Ca7",
-  "ERC20VariableCriteriaIncentive_2": "0xE7763684b43bE4491A93469aA5D7868591343dEa",
-  "ERC20VariableIncentive": "0x8cD24299D40c76f33065dE6eD4ffAB3d86Db6950",
-  "ERC20VariableIncentive_2": "0xC502d89B01b0137327adC0bd393fCee2dE6EA6d0",
+  "CGDAIncentive": "0x9Ed41B9834d6865092520D34ee75292242d3fA56",
+  "ERC20Incentive": "0x775c30cc9f5A1a7AAf4dFe2B1994Dda5F4586F15",
+  "ERC20PeggedIncentive": "0x64DFAE63662107c9C68589c726991790D00Fbc29",
+  "ERC20VariableCriteriaIncentive": "0xE7763684b43bE4491A93469aA5D7868591343dEa",
+  "ERC20VariableIncentive": "0xC502d89B01b0137327adC0bd393fCee2dE6EA6d0",
   "EventAction": "0xF1c51f679A250a542c38ed45fd5B6D050648669E",
   "ManagedBudget": "0xf109BAFC51aA2a78C831e5460dEDbDf68E866976",
   "ManagedBudgetWithFees": "0x18C217895bd8f1d8aD4F26844aAb5957Eb61C2bA",
   "OpenAllowList": "0xEe55C17D2EDBaB27603eB0d0C753c8A173ba7Ed6",
   "PointsIncentive": "0xC94a7785fDA51B849f2E781e112A4353F315e057",
-  "PointsIncentive_2": "0xC94a7785fDA51B849f2E781e112A4353F315e057",
   "SignerValidator": "0x1FC4208467B485f841D1B8AaDbDBBa987bD81a82",
   "SimpleAllowList": "0xa75E05550D6D3A7C6E960Ac8f8c4155fC64c12eF",
   "SimpleDenyList": "0x01B1dB35a5f91080c7518d917aE124E863abB0EB"

diff --git a/packages/evm/deploys/84532.json b/packages/evm/deploys/84532.json
@@ -1,24 +1,17 @@
 {
   "AllowListIncentive": "0xCB74EdD24917238c98e7c6d20B047C6D7e0feDdc",
-  "AllowListIncentive_2": "0xCB74EdD24917238c98e7c6d20B047C6D7e0feDdc",
   "BoostCore": "0xDCFFcE9d8185706780A46Cf04D9c6b86b3451497",
   "BoostRegistry": "0x54aBB00F12755Be99729E50dade1BA62c75F8879",
-  "CGDAIncentive": "0xAE1B4db43206c20B611329452f0281DF155EfbF7",
-  "CGDAIncentive_2": "0x9Ed41B9834d6865092520D34ee75292242d3fA56",
-  "ERC20Incentive": "0x3Ecf866C33BcB2DEc4A85b3298391c0f70d645AA",
-  "ERC20Incentive_2": "0x775c30cc9f5A1a7AAf4dFe2B1994Dda5F4586F15",
-  "ERC20PeggedIncentive": "0x0f87d2D3DD967916382cD740C403Fb4E414371e9",
-  "ERC20PeggedIncentive_2": "0x64DFAE63662107c9C68589c726991790D00Fbc29",
-  "ERC20VariableCriteriaIncentive": "0x7cdb385Ce8F0A35008aaA8B776b566044bca8Ca7",
-  "ERC20VariableCriteriaIncentive_2": "0xE7763684b43bE4491A93469aA5D7868591343dEa",
-  "ERC20VariableIncentive": "0x8cD24299D40c76f33065dE6eD4ffAB3d86Db6950",
-  "ERC20VariableIncentive_2": "0xC502d89B01b0137327adC0bd393fCee2dE6EA6d0",
+  "CGDAIncentive": "0x9Ed41B9834d6865092520D34ee75292242d3fA56",
+  "ERC20Incentive": "0x775c30cc9f5A1a7AAf4dFe2B1994Dda5F4586F15",
+  "ERC20PeggedIncentive": "0x64DFAE63662107c9C68589c726991790D00Fbc29",
+  "ERC20VariableCriteriaIncentive": "0xE7763684b43bE4491A93469aA5D7868591343dEa",
+  "ERC20VariableIncentive": "0xC502d89B01b0137327adC0bd393fCee2dE6EA6d0",
   "EventAction": "0xF1c51f679A250a542c38ed45fd5B6D050648669E",
   "ManagedBudget": "0xf109BAFC51aA2a78C831e5460dEDbDf68E866976",
   "ManagedBudgetWithFees": "0x18C217895bd8f1d8aD4F26844aAb5957Eb61C2bA",
   "OpenAllowList": "0xEe55C17D2EDBaB27603eB0d0C753c8A173ba7Ed6",
   "PointsIncentive": "0xC94a7785fDA51B849f2E781e112A4353F315e057",
-  "PointsIncentive_2": "0xC94a7785fDA51B849f2E781e112A4353F315e057",
   "SignerValidator": "0x1FC4208467B485f841D1B8AaDbDBBa987bD81a82",
   "SimpleAllowList": "0xa75E05550D6D3A7C6E960Ac8f8c4155fC64c12eF",
   "SimpleDenyList": "0x01B1dB35a5f91080c7518d917aE124E863abB0EB"

diff --git a/packages/evm/script/solidity/Deploy_Modules.s.sol b/packages/evm/script/solidity/Deploy_Modules.s.sol
@@ -112,7 +112,7 @@ contract ModuleBaseDeployer is ScriptUtils {
         bytes memory initCode = type(ERC20Incentive).creationCode;
         erc20Incentive = _getCreate2Address(initCode, "");
         console.log("ERC20Incentive: ", erc20Incentive);
-        deployJson = deployJsonKey.serialize("ERC20Incentive_2", erc20Incentive);
+        deployJson = deployJsonKey.serialize("ERC20Incentive", erc20Incentive);
         bool newDeploy = _deploy2(initCode, "");
         _registerIfNew(newDeploy, "ERC20Incentive_2", erc20Incentive, registry, ABoostRegistry.RegistryType.INCENTIVE);
     }
@@ -121,7 +121,7 @@ contract ModuleBaseDeployer is ScriptUtils {
         bytes memory initCode = type(ERC20PeggedIncentive).creationCode;
         erc20PeggedIncentive = _getCreate2Address(initCode, "");
         console.log("ERC20PeggedIncentive: ", erc20PeggedIncentive);
-        deployJson = deployJsonKey.serialize("ERC20PeggedIncentive_2", erc20PeggedIncentive);
+        deployJson = deployJsonKey.serialize("ERC20PeggedIncentive", erc20PeggedIncentive);
         bool newDeploy = _deploy2(initCode, "");
         _registerIfNew(newDeploy, "ERC20PeggedIncentive_2", erc20PeggedIncentive, registry, ABoostRegistry.RegistryType.INCENTIVE);
     }
@@ -130,7 +130,7 @@ contract ModuleBaseDeployer is ScriptUtils {
         bytes memory initCode = type(ERC20PeggedIncentive).creationCode;
         erc20PeggedVariableCriteriaIncentive = _getCreate2Address(initCode, "");
         console.log("ERC20PeggedVariableCriteriaIncentive: ", erc20PeggedVariableCriteriaIncentive);
-        deployJson = deployJsonKey.serialize("ERC20PeggedVariableCriteriaIncentive_2", erc20PeggedVariableCriteriaIncentive);
+        deployJson = deployJsonKey.serialize("ERC20PeggedVariableCriteriaIncentive", erc20PeggedVariableCriteriaIncentive);
         bool newDeploy = _deploy2(initCode, "");
         _registerIfNew(newDeploy, "ERC20PeggedVariableCriteriaIncentive_2", erc20PeggedVariableCriteriaIncentive, registry, ABoostRegistry.RegistryType.INCENTIVE);
     }
@@ -139,7 +139,7 @@ contract ModuleBaseDeployer is ScriptUtils {
         bytes memory initCode = type(ERC20VariableIncentive).creationCode;
         erc20VariableIncentive = _getCreate2Address(initCode, "");
         console.log("ERC20VariableIncentive: ", erc20VariableIncentive);
-        deployJson = deployJsonKey.serialize("ERC20VariableIncentive_2", erc20VariableIncentive);
+        deployJson = deployJsonKey.serialize("ERC20VariableIncentive", erc20VariableIncentive);
         bool newDeploy = _deploy2(initCode, "");
         _registerIfNew(
             newDeploy, "ERC20VariableIncentive_2", erc20VariableIncentive, registry, ABoostRegistry.RegistryType.INCENTIVE
@@ -153,7 +153,7 @@ contract ModuleBaseDeployer is ScriptUtils {
         bytes memory initCode = type(ERC20VariableCriteriaIncentive).creationCode;
         erc20VariableCriteriaIncentive = _getCreate2Address(initCode, "");
         console.log("ERC20VariableCriteriaIncentive: ", erc20VariableCriteriaIncentive);
-        deployJson = deployJsonKey.serialize("ERC20VariableCriteriaIncentive_2", erc20VariableCriteriaIncentive);
+        deployJson = deployJsonKey.serialize("ERC20VariableCriteriaIncentive", erc20VariableCriteriaIncentive);
         bool newDeploy = _deploy2(initCode, "");
         _registerIfNew(
             newDeploy,
@@ -168,7 +168,7 @@ contract ModuleBaseDeployer is ScriptUtils {
         bytes memory initCode = type(CGDAIncentive).creationCode;
         cgdaIncentive = _getCreate2Address(initCode, "");
         console.log("CGDAIncentive: ", cgdaIncentive);
-        deployJson = deployJsonKey.serialize("CGDAIncentive_2", cgdaIncentive);
+        deployJson = deployJsonKey.serialize("CGDAIncentive", cgdaIncentive);
         bool newDeploy = _deploy2(initCode, "");
         _registerIfNew(newDeploy, "CGDAIncentive_2", cgdaIncentive, registry, ABoostRegistry.RegistryType.INCENTIVE);
     }
@@ -177,7 +177,7 @@ contract ModuleBaseDeployer is ScriptUtils {
         bytes memory initCode = type(PointsIncentive).creationCode;
         pointsIncentive = _getCreate2Address(initCode, "");
         console.log("PointsIncentive: ", pointsIncentive);
-        deployJson = deployJsonKey.serialize("PointsIncentive_2", pointsIncentive);
+        deployJson = deployJsonKey.serialize("PointsIncentive", pointsIncentive);
         bool newDeploy = _deploy2(initCode, "");
         _registerIfNew(newDeploy, "PointsIncentive_2", pointsIncentive, registry, ABoostRegistry.RegistryType.INCENTIVE);
     }
@@ -186,7 +186,7 @@ contract ModuleBaseDeployer is ScriptUtils {
         bytes memory initCode = type(AllowListIncentive).creationCode;
         allowListIncentive = _getCreate2Address(initCode, "");
         console.log("AllowListIncentive: ", allowListIncentive);
-        deployJson = deployJsonKey.serialize("AllowListIncentive_2", allowListIncentive);
+        deployJson = deployJsonKey.serialize("AllowListIncentive", allowListIncentive);
         bool newDeploy = _deploy2(initCode, "");
         _registerIfNew(
             newDeploy, "AllowListIncentive_2", allowListIncentive, registry, ABoostRegistry.RegistryType.INCENTIVE