compound-finance · MishaShWoof · Aug 9, 2024 · Aug 12, 2024 · Aug 12, 2024 · Aug 12, 2024
diff --git a/deployments/base/weth/migrations/1737981787_add_wsuperoethb_as_collateral.ts b/deployments/base/weth/migrations/1737981787_add_wsuperoethb_as_collateral.ts
@@ -0,0 +1,151 @@
+import { expect } from 'chai';
+import { DeploymentManager } from '../../../../plugins/deployment_manager/DeploymentManager';
+import { migration } from '../../../../plugins/deployment_manager/Migration';
+import { calldata, exp, proposal } from '../../../../src/deploy';
+import { utils } from 'ethers';
+
+const WSUPEROETHB_ADDRESS = '0x7FcD174E80f264448ebeE8c88a7C4476AAF58Ea6';
+let newPriceFeedAddress: string;
+
+export default migration('1737981787_add_wsuperoethb_as_collateral', {
+  async prepare(deploymentManager: DeploymentManager) {
+    const ethPriceFeed = await deploymentManager.fromDep('WETH:priceFeed', 'base', 'weth');
+    const _wsuperOETHbPriceFeed = await deploymentManager.deploy(
+      'wsuperOETHb:priceFeed',
+      'pricefeeds/PriceFeedWith4626Support.sol',
+      [
+        WSUPEROETHB_ADDRESS,            // wsuperOETHb / superOETHb price feed
+        ethPriceFeed.address,                   // constant ETH price feed (we consider 1 superOETHb = 1 ETH)
+        8,                              // decimals 
+        'wsuperOETHb / ETH price feed', // description
+      ]
+    );
+
+    return { wsuperOETHbPriceFeedAddress: _wsuperOETHbPriceFeed.address };
+  },
+
+  enact: async (
+    deploymentManager: DeploymentManager,
+    govDeploymentManager: DeploymentManager,
+    { wsuperOETHbPriceFeedAddress }
+  ) => {
+    const trace = deploymentManager.tracer();
+
+    const wsuperOETHb = await deploymentManager.existing(
+      'wsuperOETHb',
+      WSUPEROETHB_ADDRESS,
+      'base',
+      'contracts/ERC20.sol:ERC20'
+    );
+    const wsuperOETHbPriceFeed = await deploymentManager.existing(
+      'wsuperOETHb:priceFeed',
+      wsuperOETHbPriceFeedAddress,
+      'base'
+    );
+
+    const {
+      bridgeReceiver,
+      comet,
+      cometAdmin,
+      configurator,
+    } = await deploymentManager.getContracts();
+
+    const { governor, baseL1CrossDomainMessenger } = await govDeploymentManager.getContracts();
+
+    const newAssetConfig = {
+      asset: wsuperOETHb.address,
+      priceFeed: wsuperOETHbPriceFeed.address,
+      decimals: await wsuperOETHb.decimals(),
+      borrowCollateralFactor: exp(0.88, 18),
+      liquidateCollateralFactor: exp(0.90, 18),
+      liquidationFactor: exp(0.95, 18),
+      supplyCap: exp(2000, 18),
+    };
+
+    newPriceFeedAddress = wsuperOETHbPriceFeed.address;
+
+    const addAssetCalldata = await calldata(
+      configurator.populateTransaction.addAsset(comet.address, newAssetConfig)
+    );
+    const deployAndUpgradeToCalldata = utils.defaultAbiCoder.encode(
+      ['address', 'address'],
+      [configurator.address, comet.address]
+    );
+
+    const l2ProposalData = utils.defaultAbiCoder.encode(
+      ['address[]', 'uint256[]', 'string[]', 'bytes[]'],
+      [
+        [configurator.address, cometAdmin.address],
+        [0, 0],
+        [
+          'addAsset(address,(address,address,uint8,uint64,uint64,uint64,uint128))',
+          'deployAndUpgradeTo(address,address)',
+        ],
+        [addAssetCalldata, deployAndUpgradeToCalldata],
+      ]
+    );
+
+    const mainnetActions = [
+      // Send the proposal to the L2 bridge
+      {
+        contract: baseL1CrossDomainMessenger,
+        signature: 'sendMessage(address,bytes,uint32)',
+        args: [bridgeReceiver.address, l2ProposalData, 3_000_000]
+      },
+    ];
+
+    const description = '# Add wsuperOETHb as collateral into cWETHv3 on Base\n\n## Proposal summary\n\nCompound Growth Program [AlphaGrowth] proposes to add wsuperOETHb into cWETHv3 on Base network. This proposal takes the governance steps recommended and necessary to update a Compound III WETH market on Base. Simulations have confirmed the market’s readiness, as much as possible, using the [Comet scenario suite](https://github.com/compound-finance/comet/tree/main/scenario). The new parameters include setting the risk parameters based off of the [recommendations from Gauntlet](https://www.comp.xyz/t/add-collateral-wsuperoethb-on-base/5782/2).\n\nFurther detailed information can be found on the corresponding [proposal pull request](https://github.com/compound-finance/comet/pull/958) and [forum discussion](https://www.comp.xyz/t/add-collateral-wsuperoethb-on-base/5782).\n\n\n## Proposal Actions\n\nThe first proposal action adds wsuperOETHb to the WETH Comet on Base. This sends the encoded `addAsset` and `deployAndUpgradeTo` calls across the bridge to the governance receiver on Base.';
+    const txn = await govDeploymentManager.retry(async () =>
+      trace(
+        await governor.propose(...(await proposal(mainnetActions, description)))
+      )
+    );
+
+    const event = txn.events.find(
+      (event) => event.event === 'ProposalCreated'
+    );
+    const [proposalId] = event.args;
+    trace(`Created proposal ${proposalId}.`);
+  },
+
+  async enacted(deploymentManager: DeploymentManager): Promise<boolean> {
+    return true;
+  },
+
+  async verify(deploymentManager: DeploymentManager) {
+    const { comet, configurator } = await deploymentManager.getContracts();
+
+    const wsuperOETHbAssetIndex = Number(await comet.numAssets()) - 1;
+
+    const wsuperOETHbAssetConfig = {
+      asset: WSUPEROETHB_ADDRESS,
+      priceFeed: newPriceFeedAddress,
+      decimals: 18,
+      borrowCollateralFactor: exp(0.88, 18),
+      liquidateCollateralFactor: exp(0.90, 18),
+      liquidationFactor: exp(0.95, 18),
+      supplyCap: exp(2000, 18),
+    };
+
+    // 1. Compare proposed asset config with Comet asset info
+    const wsuperOETHbAssetInfo = await comet.getAssetInfoByAddress(WSUPEROETHB_ADDRESS);
+    expect(wsuperOETHbAssetIndex).to.be.equal(wsuperOETHbAssetInfo.offset);
+    expect(wsuperOETHbAssetConfig.asset).to.be.equal(wsuperOETHbAssetInfo.asset);
+    expect(wsuperOETHbAssetConfig.priceFeed).to.be.equal(wsuperOETHbAssetInfo.priceFeed);
+    expect(exp(1, wsuperOETHbAssetConfig.decimals)).to.be.equal(wsuperOETHbAssetInfo.scale);
+    expect(wsuperOETHbAssetConfig.borrowCollateralFactor).to.be.equal(wsuperOETHbAssetInfo.borrowCollateralFactor);
+    expect(wsuperOETHbAssetConfig.liquidateCollateralFactor).to.be.equal(wsuperOETHbAssetInfo.liquidateCollateralFactor);
+    expect(wsuperOETHbAssetConfig.liquidationFactor).to.be.equal(wsuperOETHbAssetInfo.liquidationFactor);
+    expect(wsuperOETHbAssetConfig.supplyCap).to.be.equal(wsuperOETHbAssetInfo.supplyCap);
+
+    // 2. Compare proposed asset config with Configurator asset config
+    const configuratorWsuperOETHbAssetConfig = (await configurator.getConfiguration(comet.address)).assetConfigs[wsuperOETHbAssetIndex];
+    expect(wsuperOETHbAssetConfig.asset).to.be.equal(configuratorWsuperOETHbAssetConfig.asset);
+    expect(wsuperOETHbAssetConfig.priceFeed).to.be.equal(configuratorWsuperOETHbAssetConfig.priceFeed);
+    expect(wsuperOETHbAssetConfig.decimals).to.be.equal(configuratorWsuperOETHbAssetConfig.decimals);
+    expect(wsuperOETHbAssetConfig.borrowCollateralFactor).to.be.equal(configuratorWsuperOETHbAssetConfig.borrowCollateralFactor);
+    expect(wsuperOETHbAssetConfig.liquidateCollateralFactor).to.be.equal(configuratorWsuperOETHbAssetConfig.liquidateCollateralFactor);
+    expect(wsuperOETHbAssetConfig.liquidationFactor).to.be.equal(configuratorWsuperOETHbAssetConfig.liquidationFactor);
+    expect(wsuperOETHbAssetConfig.supplyCap).to.be.equal(configuratorWsuperOETHbAssetConfig.supplyCap);
+  },
+});
diff --git a/deployments/base/weth/relations.ts b/deployments/base/weth/relations.ts
@@ -49,4 +49,12 @@ export default {
     }
   },
 
+  WOETHBaseProxy: {
+    artifact: 'contracts/ERC20.sol:ERC20',
+    delegates: {
+      field: {
+        slot: '0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc'
+      }
+    }
+  },
 };
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -226,6 +226,7 @@ const config: HardhatUserConfig = {
           hardforkHistory: {
             berlin: 1,
             london: 2,
+            shanghai: 3,
           },
         };
         return acc;

diff --git a/scenario/constraints/MigrationConstraint.ts b/scenario/constraints/MigrationConstraint.ts
@@ -1,7 +1,7 @@
 import { StaticConstraint, Solution, World, debug } from '../../plugins/scenario';
 import { CometContext, MigrationData } from '../context/CometContext';
 import { Migration, loadMigrations, Actions } from '../../plugins/deployment_manager/Migration';
-import { modifiedPaths, subsets } from '../utils';
+import { modifiedPaths } from '../utils';
 import { DeploymentManager } from '../../plugins/deployment_manager';
 import { impersonateAddress } from '../../plugins/scenario/utils';
 import { exp } from '../../test/helpers';
@@ -22,7 +22,7 @@ export class MigrationConstraint<T extends CometContext> implements StaticConstr
   async solve(world: World) {
     const label = `[${world.base.name}] {MigrationConstraint}`;
     const solutions: Solution<T>[] = [];
-    const migrationPaths = [...subsets(await getMigrations(world))];
+    const migrationPaths = [await getMigrations(world)];
 
     for (const migrationList of migrationPaths) {
       if (migrationList.length == 0 && migrationPaths.length > 1) {

diff --git a/scripts/liquidation_bot/liquidateUnderwaterBorrowers.ts b/scripts/liquidation_bot/liquidateUnderwaterBorrowers.ts
@@ -104,8 +104,7 @@ export const flashLoanPools = {
       tokenAddress: addresses.mainnet.WETH9,
       poolFee: 500
     },
-  }
-},
+  },
   polygon: {
     usdc: {
       tokenAddress: addresses.polygon.BOB,

diff --git a/src/deploy/index.ts b/src/deploy/index.ts
@@ -149,6 +149,7 @@ export const WHALES = {
     '0x651C9D1F9da787688225f49d63ad1623ba89A8D5', // FBTC whale
     '0xC455fE28a76da80022d4C35A37eB08FF405Eb78f', // FBTC whale
     '0x524db930F0886CdE7B5FFFc920Aae85e98C2abfb', // FBTC whale
+    '0x651C9D1F9da787688225f49d63ad1623ba89A8D5', // FBTC whale
     '0x72c7d27320e042417506e594697324dB5Fbf334C', // FBTC whale
     '0x3880233e78966eb13a9c2881d5f162d646633178', // FBTC whale
     '0x233493E9DC68e548AC27E4933A600A3A4682c0c3', // FBTC whale