fix: review fixes

deployments/sepolia/usdc/roots.json

@@ -3,7 +3,5 @@
     "configurator": "0xc28aD44975C614EaBe0Ed090207314549e1c6624",
     "rewards": "0x8bF5b658bdF0388E8b482ED51B14aef58f90abfD",
     "fauceteer": "0x68793eA49297eB75DFB4610B68e076D2A5c7646C",
-    "bulker": "0x157c001bb1F8b33743B14483Be111C961d8e11dE",
-    "unichainSepoliaL1CrossDomainMessenger": "0x448A37330A60494E666F6DD60aD48d930AEbA381",
-    "unichainSepoliaL1StandardBridge": "0xea58fcA6849d79EAd1f26608855c2D6407d54Ce2"
+    "bulker": "0x157c001bb1F8b33743B14483Be111C961d8e11dE"
 }

deployments/unichain/usdc/configuration.json

@@ -6,7 +6,7 @@
     "borrowMin": "0.01e6",
     "storeFrontPriceFactor": 0.6,
     "targetReserves": "5_000_000e6",
-    "pauseGuardian": "",
+    "pauseGuardian": "0x6784FC9e931D7d5B1075e665A4016c299ee6C31B",
     "rates": {
       "borrowBase": 0.015,
       "borrowSlopeLow": 0.0333,

deployments/unichain/usdc/migrations/1727774346_configurate_and_ens.ts

@@ -7,7 +7,8 @@ import {
   proposal,
 } from '../../../../src/deploy';
 import { expect } from 'chai';
-import { utils } from 'ethers';
+import { forkedHreForBase } from '../../../../plugins/scenario/utils/hreForBase';
+import { utils, Contract, constants } from 'ethers';
 import { diffState, getCometConfig } from '../../../../plugins/deployment_manager/DiffState';
 
 const ENSName = 'compound-community-licenses.eth';
@@ -34,7 +35,6 @@ export default migration('1727774346_configurate_and_ens', {
       bridgeReceiver,
       comet,
       cometAdmin,
-      cometFactory,
       configurator,
       rewards,
       COMP: COMP_L2,
@@ -68,12 +68,6 @@ export default migration('1727774346_configurate_and_ens', {
     }
 
     const configuration = await getConfigurationStruct(deploymentManager);
-    const setFactoryCalldata = await calldata(
-      configurator.populateTransaction.setFactory(
-        comet.address,
-        cometFactory.address
-      )
-    );
     const setConfigurationCalldata = await calldata(
       configurator.populateTransaction.setConfiguration(
         comet.address,
@@ -93,20 +87,17 @@ export default migration('1727774346_configurate_and_ens', {
       ['address[]', 'uint256[]', 'string[]', 'bytes[]'],
       [
         [
-          configurator.address,
           configurator.address,
           cometAdmin.address,
           rewards.address,
         ],
-        [0, 0, 0, 0],
+        [0, 0, 0],
         [
-          'setFactory(address,address)',
           'setConfiguration(address,(address,address,address,address,address,uint64,uint64,uint64,uint64,uint64,uint64,uint64,uint64,uint64,uint64,uint64,uint64,uint104,uint104,uint104,(address,address,uint8,uint64,uint64,uint64,uint128)[]))',
           'deployAndUpgradeTo(address,address)',
           'setRewardConfig(address,address)'
         ],
         [
-          setFactoryCalldata,
           setConfigurationCalldata,
           deployAndUpgradeToCalldata,
           setRewardConfigCalldata
@@ -225,6 +216,44 @@ export default migration('1727774346_configurate_and_ens', {
     expect(config.token.toLowerCase()).to.be.equal(COMP.address.toLowerCase());
     expect(config.rescaleFactor).to.be.equal(exp(1, 12));
     expect(config.shouldUpscale).to.be.equal(true);
+
+    const cometNew = new Contract(
+      comet.address,
+      [
+        'function assetList() external view returns (address)',
+      ],
+      await deploymentManager.getSigner()
+    );
+
+    const assetListAddress = await cometNew.assetList();
+
+    expect(assetListAddress).to.not.be.equal(constants.AddressZero);
+
+    const pauseGuardian = new Contract(
+      await comet.pauseGuardian(),
+      [
+        'function getOwners() external view returns (address[] memory)',
+      ],
+      await deploymentManager.getSigner()
+    );
+
+    const hreMainnet = await forkedHreForBase({ name: '', network: 'mainnet', deployment: '' });
+    const dm = new DeploymentManager('mainnet', 'usdc', hreMainnet);
+
+    const cometMainnet = await dm.contract('comet') as Contract;
+    const guardian = await cometMainnet.pauseGuardian();
+    const GnosisSafeContract = new Contract(
+      guardian,
+      [
+        'function getOwners() external view returns (address[] memory)',
+      ],
+      await dm.getSigner()
+    );
+    const ownersMainnet = await GnosisSafeContract.getOwners();
+
+    const owners = await pauseGuardian.getOwners();
+    expect(owners).to.deep.equal(ownersMainnet);
+    expect(owners.length).to.not.be.equal(0);
 
     // 1.
     expect(await COMP.balanceOf(rewards.address)).to.be.equal(COMPAmountToBridge);

scripts/clone-multisig.ts

@@ -1,17 +1,18 @@
-import hre from 'hardhat';
 import { DeploymentManager } from '../plugins/deployment_manager/DeploymentManager';
 import { SafeFactory } from '@safe-global/safe-core-sdk';
 import EthersAdapter from '@safe-global/safe-ethers-lib';
+import { nonForkedHreForBase, forkedHreForBase } from '../plugins/scenario/utils/hreForBase';
+import { ethers } from 'ethers';
+import type { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers';
 
 const SRC_NETWORK = process.env['SRC_NETWORK'] ?? 'mainnet';
 const DST_NETWORK = process.env['DST_NETWORK'] ?? 'hardhat';
 
 async function main() {
-  await hre.changeNetwork(SRC_NETWORK);
+  const hreSRC = await forkedHreForBase({ name: SRC_NETWORK, network: SRC_NETWORK, deployment: '' });
 
-  const dm = new DeploymentManager(SRC_NETWORK, 'usdc', hre);
+  const dm = new DeploymentManager(SRC_NETWORK, 'usdc', hreSRC);
 
-  const signer_ = await dm.getSigner();
   const comet = await dm.contract('comet');
   const guardian = await comet.pauseGuardian();
 
@@ -20,17 +21,18 @@ async function main() {
     {'constant':true,'inputs':[],'name':'getOwners','outputs':[{'internalType':'address[]','name':'','type':'address[]'}],'payable':false,'stateMutability':'view','type':'function'},
     {'constant':true,'inputs':[],'name':'getThreshold','outputs':[{'internalType':'uint256','name':'','type':'uint256'}],'payable':false,'stateMutability':'view','type':'function'},
   ];
-  const GnosisSafeContract = new hre.ethers.Contract(guardian, GnosisABI, hre.ethers.provider);
+  const GnosisSafeContract = new hreSRC.ethers.Contract(guardian, GnosisABI, hreSRC.ethers.provider);
   const owners = await GnosisSafeContract.getOwners();
   const threshold = await GnosisSafeContract.getThreshold();
   const safeAccountConfig = { owners: owners, threshold: threshold};
   console.log(safeAccountConfig);
   console.log(guardian);
 
-  await hre.changeNetwork(DST_NETWORK);
+  const hreDST = await nonForkedHreForBase({ name: '', network: DST_NETWORK, deployment: '' });
+  const wallet = new ethers.Wallet(process.env.ETH_PK!, hreDST.ethers.provider);
+  const signer: SignerWithAddress = wallet as unknown as SignerWithAddress;
 
-  const signer = await hre.ethers.provider.getSigner(signer_.address);
-  const ethAdapter = new EthersAdapter({ ethers: hre.ethers, signerOrProvider: signer });
+  const ethAdapter = new EthersAdapter({ ethers: hreDST.ethers, signerOrProvider: signer });
   const safeFactory = await SafeFactory.create({ ethAdapter: ethAdapter });
   const safeSdk = await safeFactory.deploySafe({ safeAccountConfig });
   console.log(safeSdk);