fix: merge fix

deployments/arbitrum/usdc.e/migrations/1735299634_update_comet_to_support_more_collaterals.ts

@@ -17,9 +17,9 @@ export default migration('1735299634_update_comet_to_support_more_collaterals',
       []
     );
 
-    const cometFactoryExtendedAssetList = await deploymentManager.deploy(
-      'cometFactoryExtendedAssetList',
-      'CometFactoryExtendedAssetList.sol',
+    const cometFactoryWithExtendedAssetList = await deploymentManager.deploy(
+      'cometFactoryWithExtendedAssetList',
+      'CometFactoryWithExtendedAssetList.sol',
       []
     );
     const {
@@ -49,13 +49,13 @@ export default migration('1735299634_update_comet_to_support_more_collaterals',
       ]
     );
     return {
-      cometFactoryExtendedAssetList: cometFactoryExtendedAssetList.address,
+      cometFactoryWithExtendedAssetList: cometFactoryWithExtendedAssetList.address,
       newCometExt: _newCometExt.address
     };
   },
 
   async enact(deploymentManager: DeploymentManager, govDeploymentManager, {
-    cometFactoryExtendedAssetList,
+    cometFactoryWithExtendedAssetList,
     newCometExt,
   }) {
 
@@ -77,7 +77,7 @@ export default migration('1735299634_update_comet_to_support_more_collaterals',
     newCometExtAddress = newCometExt;
 
     const setFactoryCalldata = await calldata(
-      configurator.populateTransaction.setFactory(comet.address, cometFactoryExtendedAssetList)
+      configurator.populateTransaction.setFactory(comet.address, cometFactoryWithExtendedAssetList)
     );
 
     const setExtensionDelegateCalldata = await calldata(

deployments/arbitrum/usdc/migrations/1735299626_update_comet_to_support_more_collaterals.ts

@@ -21,9 +21,9 @@ export default migration('1735299626_update_comet_to_support_more_collaterals',
       []
     );
 
-    const cometFactoryExtendedAssetList = await deploymentManager.deploy(
-      'cometFactoryExtendedAssetList',
-      'CometFactoryExtendedAssetList.sol',
+    const cometFactoryWithExtendedAssetList = await deploymentManager.deploy(
+      'cometFactoryWithExtendedAssetList',
+      'CometFactoryWithExtendedAssetList.sol',
       []
     );
     const {
@@ -53,13 +53,13 @@ export default migration('1735299626_update_comet_to_support_more_collaterals',
       ]
     );
     return {
-      cometFactoryExtendedAssetList: cometFactoryExtendedAssetList.address,
+      cometFactoryWithExtendedAssetList: cometFactoryWithExtendedAssetList.address,
       newCometExt: _newCometExt.address
     };
   },
 
   async enact(deploymentManager: DeploymentManager, govDeploymentManager, {
-    cometFactoryExtendedAssetList,
+    cometFactoryWithExtendedAssetList,
     newCometExt,
   }) {
 
@@ -81,7 +81,7 @@ export default migration('1735299626_update_comet_to_support_more_collaterals',
     newCometExtAddress = newCometExt;
 
     const setFactoryCalldata = await calldata(
-      configurator.populateTransaction.setFactory(comet.address, cometFactoryExtendedAssetList)
+      configurator.populateTransaction.setFactory(comet.address, cometFactoryWithExtendedAssetList)
     );
     const setExtensionDelegateCalldata = await calldata(
       configurator.populateTransaction.setExtensionDelegate(comet.address, newCometExt)
@@ -92,7 +92,7 @@ export default migration('1735299626_update_comet_to_support_more_collaterals',
     );
 
     const setFactoryCalldataUSDCE = await calldata(
-      configurator.populateTransaction.setFactory(USDCE_COMET, cometFactoryExtendedAssetList)
+      configurator.populateTransaction.setFactory(USDCE_COMET, cometFactoryWithExtendedAssetList)
     );
     const setExtensionDelegateCalldataUSDCE = await calldata(
       configurator.populateTransaction.setExtensionDelegate(USDCE_COMET, newCometExt)
@@ -103,7 +103,7 @@ export default migration('1735299626_update_comet_to_support_more_collaterals',
     );
 
     const setFactoryCalldataUSDT = await calldata(
-      configurator.populateTransaction.setFactory(USDT_COMET, cometFactoryExtendedAssetList)
+      configurator.populateTransaction.setFactory(USDT_COMET, cometFactoryWithExtendedAssetList)
     );
     const setExtensionDelegateCalldataUSDT = await calldata(
       configurator.populateTransaction.setExtensionDelegate(USDT_COMET, newCometExt)
@@ -114,7 +114,7 @@ export default migration('1735299626_update_comet_to_support_more_collaterals',
     );
 
     const setFactoryCalldataWETH = await calldata(
-      configurator.populateTransaction.setFactory(WETH_COMET, cometFactoryExtendedAssetList)
+      configurator.populateTransaction.setFactory(WETH_COMET, cometFactoryWithExtendedAssetList)
     );
     const setExtensionDelegateCalldataWETH = await calldata(
       configurator.populateTransaction.setExtensionDelegate(WETH_COMET, newCometExt)

deployments/arbitrum/usdt/migrations/1735299656_update_comet_to_support_more_collaterals.ts

@@ -17,9 +17,9 @@ export default migration('1735299656_update_comet_to_support_more_collaterals',
       []
     );
 
-    const cometFactoryExtendedAssetList = await deploymentManager.deploy(
-      'cometFactoryExtendedAssetList',
-      'CometFactoryExtendedAssetList.sol',
+    const cometFactoryWithExtendedAssetList = await deploymentManager.deploy(
+      'cometFactoryWithExtendedAssetList',
+      'CometFactoryWithExtendedAssetList.sol',
       []
     );
     const {
@@ -49,13 +49,13 @@ export default migration('1735299656_update_comet_to_support_more_collaterals',
       ]
     );
     return {
-      cometFactoryExtendedAssetList: cometFactoryExtendedAssetList.address,
+      cometFactoryWithExtendedAssetList: cometFactoryWithExtendedAssetList.address,
       newCometExt: _newCometExt.address
     };
   },
 
   async enact(deploymentManager: DeploymentManager, govDeploymentManager, {
-    cometFactoryExtendedAssetList,
+    cometFactoryWithExtendedAssetList,
     newCometExt,
   }) {
 
@@ -77,7 +77,7 @@ export default migration('1735299656_update_comet_to_support_more_collaterals',
     newCometExtAddress = newCometExt;
 
     const setFactoryCalldata = await calldata(
-      configurator.populateTransaction.setFactory(comet.address, cometFactoryExtendedAssetList)
+      configurator.populateTransaction.setFactory(comet.address, cometFactoryWithExtendedAssetList)
     );
 
     const setExtensionDelegateCalldata = await calldata(

deployments/arbitrum/weth/migrations/1735299663_update_comet_to_support_more_collaterals.ts

@@ -17,9 +17,9 @@ export default migration('1735299663_update_comet_to_support_more_collaterals',
       []
     );
 
-    const cometFactoryExtendedAssetList = await deploymentManager.deploy(
-      'cometFactoryExtendedAssetList',
-      'CometFactoryExtendedAssetList.sol',
+    const cometFactoryWithExtendedAssetList = await deploymentManager.deploy(
+      'cometFactoryWithExtendedAssetList',
+      'CometFactoryWithExtendedAssetList.sol',
       []
     );
     const {
@@ -49,13 +49,13 @@ export default migration('1735299663_update_comet_to_support_more_collaterals',
       ]
     );
     return {
-      cometFactoryExtendedAssetList: cometFactoryExtendedAssetList.address,
+      cometFactoryWithExtendedAssetList: cometFactoryWithExtendedAssetList.address,
       newCometExt: _newCometExt.address
     };
   },
 
   async enact(deploymentManager: DeploymentManager, govDeploymentManager, {
-    cometFactoryExtendedAssetList,
+    cometFactoryWithExtendedAssetList,
     newCometExt,
   }) {
 
@@ -77,7 +77,7 @@ export default migration('1735299663_update_comet_to_support_more_collaterals',
     newCometExtAddress = newCometExt;
 
     const setFactoryCalldata = await calldata(
-      configurator.populateTransaction.setFactory(comet.address, cometFactoryExtendedAssetList)
+      configurator.populateTransaction.setFactory(comet.address, cometFactoryWithExtendedAssetList)
     );
 
     const setExtensionDelegateCalldata = await calldata(

deployments/base/aero/migrations/1735299703_update_comet_to_support_more_collaterals.ts

@@ -20,9 +20,9 @@ export default migration('1735299703_update_comet_to_support_more_collaterals',
       []
     );
 
-    const cometFactoryExtendedAssetList = await deploymentManager.deploy(
-      'cometFactoryExtendedAssetList',
-      'CometFactoryExtendedAssetList.sol',
+    const cometFactoryWithExtendedAssetList = await deploymentManager.deploy(
+      'cometFactoryWithExtendedAssetList',
+      'CometFactoryWithExtendedAssetList.sol',
       []
     );
     const {
@@ -52,13 +52,13 @@ export default migration('1735299703_update_comet_to_support_more_collaterals',
       ]
     );
     return {
-      cometFactoryExtendedAssetList: cometFactoryExtendedAssetList.address,
+      cometFactoryWithExtendedAssetList: cometFactoryWithExtendedAssetList.address,
       newCometExt: _newCometExt.address
     };
   },
 
   async enact(deploymentManager: DeploymentManager, govDeploymentManager, {
-    cometFactoryExtendedAssetList,
+    cometFactoryWithExtendedAssetList,
     newCometExt,
   }) {
 
@@ -78,7 +78,7 @@ export default migration('1735299703_update_comet_to_support_more_collaterals',
     newCometExtAddress = newCometExt;
 
     const setFactoryCalldata = await calldata(
-      configurator.populateTransaction.setFactory(comet.address, cometFactoryExtendedAssetList)
+      configurator.populateTransaction.setFactory(comet.address, cometFactoryWithExtendedAssetList)
     );
     const setExtensionDelegateCalldata = await calldata(
       configurator.populateTransaction.setExtensionDelegate(comet.address, newCometExt)
@@ -89,7 +89,7 @@ export default migration('1735299703_update_comet_to_support_more_collaterals',
     );
 
     const setFactoryCalldataUSDC = await calldata(
-      configurator.populateTransaction.setFactory(USDC_COMET, cometFactoryExtendedAssetList)
+      configurator.populateTransaction.setFactory(USDC_COMET, cometFactoryWithExtendedAssetList)
     );
     const setExtensionDelegateCalldataUSDC = await calldata(
       configurator.populateTransaction.setExtensionDelegate(USDC_COMET, newCometExt)
@@ -100,7 +100,7 @@ export default migration('1735299703_update_comet_to_support_more_collaterals',
     );
 
     const setFactoryCalldataWETH = await calldata(
-      configurator.populateTransaction.setFactory(WETH_COMET, cometFactoryExtendedAssetList)
+      configurator.populateTransaction.setFactory(WETH_COMET, cometFactoryWithExtendedAssetList)
     );
     const setExtensionDelegateCalldataWETH = await calldata(
       configurator.populateTransaction.setExtensionDelegate(WETH_COMET, newCometExt)
@@ -111,7 +111,7 @@ export default migration('1735299703_update_comet_to_support_more_collaterals',
     );
 
     const setFactoryCalldataUSDBC = await calldata(
-      configurator.populateTransaction.setFactory(USDBC_COMET, cometFactoryExtendedAssetList)
+      configurator.populateTransaction.setFactory(USDBC_COMET, cometFactoryWithExtendedAssetList)
     );
     const setExtensionDelegateCalldataUSDBC = await calldata(
       configurator.populateTransaction.setExtensionDelegate(USDBC_COMET, newCometExt)

deployments/base/usdbc/migrations/1735299714_update_comet_to_support_more_collaterals.ts

@@ -16,9 +16,9 @@ export default migration('1735299714_update_comet_to_support_more_collaterals',
       []
     );
 
-    const cometFactoryExtendedAssetList = await deploymentManager.deploy(
-      'cometFactoryExtendedAssetList',
-      'CometFactoryExtendedAssetList.sol',
+    const cometFactoryWithExtendedAssetList = await deploymentManager.deploy(
+      'cometFactoryWithExtendedAssetList',
+      'CometFactoryWithExtendedAssetList.sol',
       []
     );
     const {
@@ -48,13 +48,13 @@ export default migration('1735299714_update_comet_to_support_more_collaterals',
       ]
     );
     return {
-      cometFactoryExtendedAssetList: cometFactoryExtendedAssetList.address,
+      cometFactoryWithExtendedAssetList: cometFactoryWithExtendedAssetList.address,
       newCometExt: _newCometExt.address
     };
   },
 
   async enact(deploymentManager: DeploymentManager, govDeploymentManager, {
-    cometFactoryExtendedAssetList,
+    cometFactoryWithExtendedAssetList,
     newCometExt,
   }) {
 
@@ -74,7 +74,7 @@ export default migration('1735299714_update_comet_to_support_more_collaterals',
     newCometExtAddress = newCometExt;
 
     const setFactoryCalldata = await calldata(
-      configurator.populateTransaction.setFactory(comet.address, cometFactoryExtendedAssetList)
+      configurator.populateTransaction.setFactory(comet.address, cometFactoryWithExtendedAssetList)
     );
 
     const setExtensionDelegateCalldata = await calldata(

deployments/base/usdc/migrations/1735299718_update_comet_to_support_more_collaterals.ts

@@ -16,9 +16,9 @@ export default migration('1735299718_update_comet_to_support_more_collaterals',
       []
     );
 
-    const cometFactoryExtendedAssetList = await deploymentManager.deploy(
-      'cometFactoryExtendedAssetList',
-      'CometFactoryExtendedAssetList.sol',
+    const cometFactoryWithExtendedAssetList = await deploymentManager.deploy(
+      'cometFactoryWithExtendedAssetList',
+      'CometFactoryWithExtendedAssetList.sol',
       []
     );
     const {
@@ -48,13 +48,13 @@ export default migration('1735299718_update_comet_to_support_more_collaterals',
       ]
     );
     return {
-      cometFactoryExtendedAssetList: cometFactoryExtendedAssetList.address,
+      cometFactoryWithExtendedAssetList: cometFactoryWithExtendedAssetList.address,
       newCometExt: _newCometExt.address
     };
   },
 
   async enact(deploymentManager: DeploymentManager, govDeploymentManager, {
-    cometFactoryExtendedAssetList,
+    cometFactoryWithExtendedAssetList,
     newCometExt,
   }) {
 
@@ -74,7 +74,7 @@ export default migration('1735299718_update_comet_to_support_more_collaterals',
     newCometExtAddress = newCometExt;
 
     const setFactoryCalldata = await calldata(
-      configurator.populateTransaction.setFactory(comet.address, cometFactoryExtendedAssetList)
+      configurator.populateTransaction.setFactory(comet.address, cometFactoryWithExtendedAssetList)
     );
 
     const setExtensionDelegateCalldata = await calldata(

deployments/base/weth/migrations/1735299723_update_comet_to_support_more_collaterals.ts

@@ -16,9 +16,9 @@ export default migration('1735299723_update_comet_to_support_more_collaterals',
       []
     );
 
-    const cometFactoryExtendedAssetList = await deploymentManager.deploy(
-      'cometFactoryExtendedAssetList',
-      'CometFactoryExtendedAssetList.sol',
+    const cometFactoryWithExtendedAssetList = await deploymentManager.deploy(
+      'cometFactoryWithExtendedAssetList',
+      'CometFactoryWithExtendedAssetList.sol',
       []
     );
     const {
@@ -48,13 +48,13 @@ export default migration('1735299723_update_comet_to_support_more_collaterals',
       ]
     );
     return {
-      cometFactoryExtendedAssetList: cometFactoryExtendedAssetList.address,
+      cometFactoryWithExtendedAssetList: cometFactoryWithExtendedAssetList.address,
       newCometExt: _newCometExt.address
     };
   },
 
   async enact(deploymentManager: DeploymentManager, govDeploymentManager, {
-    cometFactoryExtendedAssetList,
+    cometFactoryWithExtendedAssetList,
     newCometExt,
   }) {
 
@@ -74,7 +74,7 @@ export default migration('1735299723_update_comet_to_support_more_collaterals',
     newCometExtAddress = newCometExt;
 
     const setFactoryCalldata = await calldata(
-      configurator.populateTransaction.setFactory(comet.address, cometFactoryExtendedAssetList)
+      configurator.populateTransaction.setFactory(comet.address, cometFactoryWithExtendedAssetList)
     );
 
     const setExtensionDelegateCalldata = await calldata(