feat: move new cometExt to its own contract

woof-software · artemwoofsoftware · Aug 9, 2024 · Aug 12, 2024 · Aug 12, 2024 · Aug 12, 2024
commit fc16ae0e756e7bf4dd7daea053850fc60b1c64df
diff --git a/contracts/CometExt.sol b/contracts/CometExt.sol
@@ -29,16 +29,13 @@ contract CometExt is CometExtInterface {
     /// @dev The ERC20 symbol for wrapped base token
     bytes32 internal immutable symbol32;
 
-    address immutable public assetListFactory;
-
     /**
      * @notice Construct a new protocol instance
      * @param config The mapping of initial/constant parameters
      **/
-    constructor(ExtConfiguration memory config, address assetListFactoryAddress) {
+    constructor(ExtConfiguration memory config) {
         name32 = config.name32;
         symbol32 = config.symbol32;
-        assetListFactory = assetListFactoryAddress;
     }
 
     /** External getters for internal constants **/

diff --git a/contracts/CometExtAssetList.sol b/contracts/CometExtAssetList.sol
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity 0.8.15;
+
+import "./CometExt.sol";
+
+contract CometExtAssetList is CometExt {
+
+    address immutable public assetListFactory;
+
+    /**
+     * @notice Construct a new protocol instance
+     * @param config The mapping of initial/constant parameters
+     **/
+    constructor(ExtConfiguration memory config, address assetListFactoryAddress) CometExt(config) {
+        assetListFactory = assetListFactoryAddress;
+    }
+}
diff --git a/contracts/CometExtendedAssetList.sol b/contracts/CometExtendedAssetList.sol
@@ -5,6 +5,7 @@
 import "./IERC20NonStandard.sol";
 import "./IPriceFeed.sol";
 import "./IAssetListFactory.sol";
+import "./IAssetListFactoryHolder.sol";
 import "./IAssetList.sol";
 
 /**
@@ -155,7 +156,7 @@
         // Set asset info
         numAssets = uint8(config.assetConfigs.length);
 
-        assetList = IAssetListFactory(IAssetListFactory(extensionDelegate).assetListFactory()).createAssetList(config.assetConfigs);
+        assetList = IAssetListFactory(IAssetListFactoryHolder(extensionDelegate).assetListFactory()).createAssetList(config.assetConfigs);
     }
 
     /**
@@ -175,12 +176,12 @@
    function nonReentrantBefore() internal {
        bytes32 slot = REENTRANCY_GUARD_FLAG_SLOT;
        uint256 status;
        assembly ("memory-safe") {
            status := sload(slot)
        }

        if (status == REENTRANCY_GUARD_ENTERED) revert ReentrantCallBlocked();
        assembly ("memory-safe") {
            sstore(slot, REENTRANCY_GUARD_ENTERED)
        }
    }
@@ -190,8 +191,8 @@
     */
    function nonReentrantAfter() internal {
        bytes32 slot = REENTRANCY_GUARD_FLAG_SLOT;
        uint256 status;
        assembly ("memory-safe") {
            sstore(slot, REENTRANCY_GUARD_NOT_ENTERED)
        }
    }
@@ -634,7 +635,7 @@
        uint256 preTransferBalance = IERC20NonStandard(asset).balanceOf(address(this));
        IERC20NonStandard(asset).transferFrom(from, address(this), amount);
        bool success;
        assembly ("memory-safe") {
            switch returndatasize()
                case 0 {                       // This is a non-standard ERC-20
                    success := not(0)          // set success to true
@@ -658,7 +659,7 @@
    function doTransferOut(address asset, address to, uint amount) internal {
        IERC20NonStandard(asset).transfer(to, amount);
        bool success;
        assembly ("memory-safe") {
            switch returndatasize()
                case 0 {                       // This is a non-standard ERC-20
                    success := not(0)          // set success to true
@@ -1007,9 +1008,9 @@

        uint startGas = gasleft();
        accrueInternal();
        for (uint i = 0; i < accounts.length; ) {
            absorbInternal(absorber, accounts[i]);
            unchecked { i++; }
        }
        uint gasUsed = startGas - gasleft();

@@ -1018,7 +1019,7 @@
        // Using gas price instead of base fee would more accurately reflect spend,
        //  but is also subject to abuse if refunds were to be given automatically.
        LiquidatorPoints memory points = liquidatorPoints[absorber];
        points.numAbsorbs++;
        points.numAbsorbed += safe64(accounts.length);
        points.approxSpend += safe128(gasUsed * block.basefee);
        liquidatorPoints[absorber] = points;
@@ -1036,7 +1037,7 @@
        uint16 assetsIn = accountUser.assetsIn;

        uint256 basePrice = getPrice(baseTokenPriceFeed);
        uint256 deltaValue = 0;

        for (uint8 i = 0; i < numAssets; ) {
            if (isInAsset(assetsIn, i)) {
@@ -1051,7 +1052,7 @@

                emit AbsorbCollateral(absorber, account, asset, seizeAmount, value);
            }
            unchecked { i++; }
        }

        uint256 deltaBalance = divPrice(deltaValue, basePrice, uint64(baseScale));
@@ -1095,7 +1096,7 @@
        if (isBuyPaused()) revert Paused();

        int reserves = getReserves();
        if (reserves >= 0 && uint(reserves) >= targetReserves) revert NotForSale();

        // Note: Re-entrancy can skip the reserves check above on a second buyCollateral call.
        baseAmount = doTransferIn(baseToken, msg.sender, baseAmount);
@@ -1211,9 +1212,9 @@
    /**
     * @notice Fallback to calling the extension delegate for everything else
     */
    fallback() external payable {
        address delegate = extensionDelegate;
        assembly {
            calldatacopy(0, 0, calldatasize())
            let result := delegatecall(gas(), delegate, 0, calldatasize(), 0, 0)
            returndatacopy(0, 0, returndatasize())

diff --git a/contracts/IAssetListFactory.sol b/contracts/IAssetListFactory.sol
@@ -8,6 +8,4 @@ import "./CometCore.sol";
  */
 interface IAssetListFactory {
     function createAssetList(CometCore.AssetConfig[] memory assetConfigs) external returns (address assetList);
-    // add it here to save space in Comet
-    function assetListFactory() external view returns (address);
 }
diff --git a/contracts/IAssetListFactoryHolder.sol b/contracts/IAssetListFactoryHolder.sol
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity 0.8.15;
+
+/**
+ * @title Compound's Asset List Factory Holder Interface
+ * @author Compound
+ */
+interface IAssetListFactoryHolder {
+    function assetListFactory() external view returns (address);
+}
diff --git a/deployments/mainnet/weth/migrations/1723198576_update_comet_to_support_more_collaterals.ts b/deployments/mainnet/weth/migrations/1723198576_update_comet_to_support_more_collaterals.ts
@@ -20,14 +20,28 @@ export default migration('1723198576_update_comet_to_support_more_collaterals',
       'CometFactoryExtendedAssetList.sol',
       []
     );
+    const {
+      comet
+    } = await deploymentManager.getContracts();
+
+    const extensionDelegate = new Contract(
+      await comet.extensionDelegate(),
+      [
+        'function name() external view returns (string)',
+        'function symbol() external view returns (string)',
+      ],
+      deploymentManager.hre.ethers.provider
+    );
+    const name = await extensionDelegate.name();
+    const symbol = await extensionDelegate.symbol();
 
     const _newCometExt = await deploymentManager.deploy(
-      'CometExt',
-      'CometExt.sol',
+      'CometExtAssetList',
+      'CometExtAssetList.sol',
       [
         {
-          name32: ethers.utils.formatBytes32String('Compound WETH'),
-          symbol32: ethers.utils.formatBytes32String('cWETHv3')
+          name32: ethers.utils.formatBytes32String(name),
+          symbol32: ethers.utils.formatBytes32String(symbol)
         },
         _assetListFactory.address
       ]

diff --git a/src/deploy/Network.ts b/src/deploy/Network.ts
@@ -119,8 +119,6 @@ export async function deployNetworkComet(
     rewardTokenAddress
   } = await getConfiguration(deploymentManager, configOverrides);
 
-  const assetListFactory = await deploymentManager.deploy('assetListFactory', 'AssetListFactory.sol', [], maybeForce());
-
   /* Deploy contracts */
 
   const cometAdmin = await deploymentManager.deploy(
@@ -137,7 +135,7 @@ export async function deployNetworkComet(
   const cometExt = await deploymentManager.deploy(
     'comet:implementation:implementation',
     'CometExt.sol',
-    [extConfiguration, assetListFactory.address],
+    [extConfiguration],
     maybeForce(deploySpec.cometExt)
   );
 

diff --git a/test/asset-info-test-asset-list-comet.ts b/test/asset-info-test-asset-list-comet.ts
@@ -1,5 +1,11 @@
 import { expect, exp, makeConfigurator, ONE } from './helpers';
-import { SimplePriceFeed__factory, FaucetToken__factory, CometExt__factory, CometExtendedAssetList__factory, AssetListFactory__factory } from '../build/types';
+import {
+  SimplePriceFeed__factory,
+  FaucetToken__factory,
+  CometExtAssetList__factory,
+  CometExtendedAssetList__factory,
+  AssetListFactory__factory
+} from '../build/types';
 
 import { ethers } from 'hardhat';
 describe('asset info', function () {
@@ -105,7 +111,7 @@ describe('asset info', function () {
     const assetListFactory = await AssetListFactory.deploy();
     await assetListFactory.deployed();
 
-    const CometExtFactory = (await ethers.getContractFactory('CometExt')) as CometExt__factory;
+    const CometExtFactory = (await ethers.getContractFactory('CometExtAssetList')) as CometExtAssetList__factory;
     const extensionDelegate = await CometExtFactory.deploy({ name32, symbol32 }, assetListFactory.address);
     await extensionDelegate.deployed();
 

diff --git a/test/constructor-test.ts b/test/constructor-test.ts
@@ -4,7 +4,6 @@ import {
   CometHarness__factory,
   FaucetToken__factory,
   SimplePriceFeed__factory,
-  AssetListFactory__factory,
 } from '../build/types';
 
 describe('constructor', function () {
@@ -17,16 +16,12 @@ describe('constructor', function () {
 
   it('verifies asset scales', async function () {
     const [governor, pauseGuardian] = await ethers.getSigners();
-    const AssetListFactory = (await ethers.getContractFactory('AssetListFactory')) as AssetListFactory__factory;
-    const assetListFactory = await AssetListFactory.deploy();
-    await assetListFactory.deployed();
-
     // extension delegate
     const CometExtFactory = (await ethers.getContractFactory('CometExt')) as CometExt__factory;
     const extensionDelegate = await CometExtFactory.deploy({
       name32: ethers.utils.formatBytes32String('Compound Comet'),
       symbol32: ethers.utils.formatBytes32String('📈BASE'),
-    }, assetListFactory.address);
+    });
     await extensionDelegate.deployed();
 
     // tokens

diff --git a/test/helpers.ts b/test/helpers.ts
@@ -7,7 +7,7 @@ import {
   BaseBulker,
   BaseBulker__factory,
   CometExt,
-  CometExt__factory,
+  CometExtAssetList__factory,
   CometHarness__factory,
   CometHarnessInterface as Comet,
   CometRewards,
@@ -282,7 +282,7 @@ export async function makeProtocol(opts: ProtocolOpts = {}): Promise<Protocol> {
 
   let extensionDelegate = opts.extensionDelegate;
   if (extensionDelegate === undefined) {
-    const CometExtFactory = (await ethers.getContractFactory('CometExt')) as CometExt__factory;
+    const CometExtFactory = (await ethers.getContractFactory('CometExtAssetList')) as CometExtAssetList__factory;
     extensionDelegate = await CometExtFactory.deploy({ name32, symbol32 }, assetListFactory.address);
     await extensionDelegate.deployed();
   }

diff --git a/test/liquidation/makeLiquidatableProtocol.ts b/test/liquidation/makeLiquidatableProtocol.ts
@@ -6,7 +6,6 @@ import {
   CometHarness__factory,
   CometHarnessInterface,
   OnChainLiquidator__factory,
-  AssetListFactory__factory,
 } from '../../build/types';
 import {
   BALANCER_VAULT,
@@ -52,15 +51,12 @@ export enum Exchange {
 }
 
 export async function makeProtocol() {
-  const AssetListFactory = (await ethers.getContractFactory('AssetListFactory')) as AssetListFactory__factory;
-  const assetListFactory = await AssetListFactory.deploy();
-  await assetListFactory.deployed();
 
   // build Comet
   const CometExtFactory = (await ethers.getContractFactory('CometExt')) as CometExt__factory;
   const name32 = ethers.utils.formatBytes32String('Compound Comet');
   const symbol32 = ethers.utils.formatBytes32String('📈BASE');
-  const extensionDelegate = await CometExtFactory.deploy({ name32, symbol32 }, assetListFactory.address);
+  const extensionDelegate = await CometExtFactory.deploy({ name32, symbol32 });
   await extensionDelegate.deployed();
 
   const CometFactory = (await ethers.getContractFactory('CometHarness')) as CometHarness__factory;

diff --git a/test/tracking-index-bounds-test.ts b/test/tracking-index-bounds-test.ts
@@ -26,7 +26,7 @@ describe('total tracking index bounds', function () {
         totalSupplyBase: BigNumber.from(baseMinForRewards), // 10k USDC base units
       });
 
-      await fastForward(secondsUntilOverflow-1);
+      await fastForward(secondsUntilOverflow-2);
 
       // First accrue is successful without overflow
       await comet.accrue();
@@ -58,7 +58,7 @@ describe('total tracking index bounds', function () {
         totalBorrowBase: BigNumber.from(baseMinForRewards), // 10k USDC base units
       });
 
-      await fastForward(secondsUntilOverflow-1);
+      await fastForward(secondsUntilOverflow-2);
 
       // First accrue is successful without overflow
       await comet.accrue();
@@ -153,7 +153,7 @@ describe('total tracking index bounds', function () {
         totalSupplyBase: BigNumber.from(baseMinForRewards), // 100 WETH base units
       });
 
-      await fastForward(secondsUntilOverflow-1);
+      await fastForward(secondsUntilOverflow-2);
 
       // First accrue is successful without overflow
       await comet.accrue();
@@ -186,7 +186,7 @@ describe('total tracking index bounds', function () {
         totalBorrowBase: BigNumber.from(baseMinForRewards), // 10k USDC base units
       });
 
-      await fastForward(secondsUntilOverflow-1);
+      await fastForward(secondsUntilOverflow-2);
 
       // First accrue is successful without overflow
       await comet.accrue();