fix(notional): Fix contract name and bytecode shadowing issues for temp Notional contracts

contracts/protocol/integration/wrap/notional/WrappedfCash.sol

@@ -5,6 +5,9 @@ import { INotionalV2 } from "wrapped-fcash/interfaces/notional/INotionalV2.sol";
 import { IWETH9 } from "wrapped-fcash/interfaces/IWETH9.sol";
 
 contract WrappedfCash is wfCashERC4626 {
+    // Does nothing - disambiguates this contract from WrappedfCashFactory so
+    // hardhat-etherscan can verify it.
+    uint8 public noop;
     constructor(INotionalV2 _notionalProxy, IWETH9 _weth) wfCashERC4626(_notionalProxy, _weth){
     }
 }

contracts/protocol/integration/wrap/notional/WrappedfCashFactoryExperimental.sol

@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.11;
+import { WrappedfCashFactory } from "wrapped-fcash/contracts/proxy/WrappedfCashFactory.sol";
+
+// This contract will be removed before NotionalTradeModule goes to production. It's temporarily included
+// to support module development and staging_mainnet testing before Notional deploys their own version of it.
+contract WrappedfCashFactoryExperimental is WrappedfCashFactory {
+    // Does nothing - disambiguates this contract from WrappedfCashFactory so
+    // hardhat-etherscan can verify it.
+    uint8 public noop;
+    constructor(address _beacon) WrappedfCashFactory(_beacon){
+    }
+}

contracts/protocol/integration/wrap/notional/nUpgradeableBeacon.sol

@@ -6,6 +6,9 @@ import "openzeppelin-contracts-V4/proxy/beacon/UpgradeableBeacon.sol";
 /// @dev Re-exporting to make available to brownie
 /// UpgradeableBeacon is Ownable, default owner is the deployer
 contract nUpgradeableBeacon is UpgradeableBeacon {
+    // Does nothing - disambiguates this contract from WrappedfCashFactory so
+    // hardhat-etherscan can verify it.
+    uint8 public noop;
     constructor(address implementation_) UpgradeableBeacon(implementation_) {}
 }
 

test/integration/notionalTradeModule/notionalTradeModule.spec.ts

@@ -22,7 +22,7 @@ import {
   ManagerIssuanceHookMock,
   NotionalTradeModule,
   WrappedfCash,
-  WrappedfCashFactory,
+  WrappedfCashFactoryExperimental,
 } from "@utils/contracts";
 
 import { IERC20 } from "@typechain/IERC20";
@@ -96,7 +96,7 @@ describe("Notional trade module integration [ @forked-mainnet ]", () => {
           let underlyingTokenAmount: BigNumber;
           let fCashAmount: BigNumber;
           let snapshotId: string;
-          let wrappedFCashFactory: WrappedfCashFactory;
+          let wrappedFCashFactory: WrappedfCashFactoryExperimental;
 
           before(async () => {
             wrappedFCashFactory = await deployWrappedfCashFactory(

test/integration/notionalTradeModule/utils.ts

@@ -1,6 +1,6 @@
 import { ethers, network } from "hardhat";
 import { BigNumber, Signer } from "ethers";
-import { INotionalProxy, WrappedfCash, WrappedfCashFactory } from "@utils/contracts";
+import { INotionalProxy, WrappedfCash, WrappedfCashFactoryExperimental } from "@utils/contracts";
 import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/dist/src/signer-with-address";
 import { IERC20 } from "@typechain/IERC20";
 import { ICErc20 } from "@typechain/ICErc20";
@@ -95,7 +95,7 @@ export async function getCurrencyIdAndMaturity(underlyingAddress: string, maturi
 }
 
 export async function deployWrappedfCashInstance(
-  wrappedfCashFactory: WrappedfCashFactory,
+  wrappedfCashFactory: WrappedfCashFactoryExperimental,
   currencyId: number,
   maturity: BigNumber,
 ) {

utils/contracts/index.ts

@@ -127,7 +127,7 @@ export { WrapV2AdapterMock } from "../../typechain/WrapV2AdapterMock";
 export { WrapModule } from "../../typechain/WrapModule";
 export { WrapModuleV2 } from "../../typechain/WrapModuleV2";
 export { WrappedfCash } from "../../typechain/WrappedfCash";
-export { WrappedfCashFactory } from "../../typechain/WrappedfCashFactory";
+export { WrappedfCashFactoryExperimental } from "../../typechain/WrappedfCashFactoryExperimental";
 export { WrappedfCashMock } from "../../typechain/WrappedfCashMock";
 export { WrappedfCashFactoryMock } from "../../typechain/WrappedfCashFactoryMock";
 export { YearnWrapV2Adapter } from "../../typechain/YearnWrapV2Adapter";

utils/contracts/notional.ts

@@ -1,3 +1,3 @@
 // External Uniswap Contracts
 export { WrappedfCash } from "../../typechain/WrappedfCash";
-export { WrappedfCashFactory } from "../../typechain/WrappedfCashFactory";
+export { WrappedfCashFactoryExperimental } from "../../typechain/WrappedfCashFactoryExperimental";

utils/deploys/deployExternal.ts

@@ -37,7 +37,7 @@ import { Unitroller__factory } from "../../typechain/factories/Unitroller__facto
 import { WETH9__factory } from "../../typechain/factories/WETH9__factory";
 import { WhitePaperInterestRateModel__factory } from "../../typechain/factories/WhitePaperInterestRateModel__factory";
 import { WrappedfCash__factory } from "../../typechain/factories/WrappedfCash__factory";
-import { WrappedfCashFactory__factory } from "../../typechain/factories/WrappedfCashFactory__factory";
+import { WrappedfCashFactoryExperimental__factory } from "../../typechain/factories/WrappedfCashFactoryExperimental__factory";
 
 import {
   CurveDeposit,
@@ -73,7 +73,7 @@ import {
 
 import {
   WrappedfCash,
-  WrappedfCashFactory
+  WrappedfCashFactoryExperimental
 } from "../contracts/notional";
 
 import { StakingRewards__factory } from "../../typechain/factories/StakingRewards__factory";
@@ -732,8 +732,8 @@ export default class DeployExternalContracts {
     return await new WrappedfCash__factory(this._deployerSigner).deploy(notionalProxy, weth);
   }
 
-  public async deployWrappedfCashFactory(beacon: Address): Promise<WrappedfCashFactory> {
-    return await new WrappedfCashFactory__factory(this._deployerSigner).deploy(beacon);
+  public async deployWrappedfCashFactory(beacon: Address): Promise<WrappedfCashFactoryExperimental> {
+    return await new WrappedfCashFactoryExperimental__factory(this._deployerSigner).deploy(beacon);
   }