diff --git a/contract-addresses/mainnetAddresses.json b/contract-addresses/mainnetAddresses.json deleted file mode 100644 index 70031ef4f..000000000 --- a/contract-addresses/mainnetAddresses.json +++ /dev/null @@ -1,146 +0,0 @@ - -{ - "aave" : {"artifactName" : "IERC20", "address" : "0x7Fc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9"}, - "aaveEthPCVDeposit": { "artifactName": "AavePCVDeposit", "address": "0x5B86887e171bAE0C2C826e87E34Df8D558C079B9"}, - "aaveEthPCVDripController": { "artifactName": "PCVDripController", "address": "0xb3D63876d95d3a5e591D4DE536dC410b97244086"}, - "aaveFeiPCVDeposit" : { "artifactName" : "AavePCVDeposit", "address" : "0xaFBd7Bd91B4c1Dd289EE47a4F030FBeDfa7ABc12"}, - "aaveGovernanceV2" : {"artifactName" : "IAaveGovernanceV2", "address" : "0xEC568fffba86c094cf06b22134B23074DFE2252c"}, - "aaveIncentivesController" : {"artifactName": "IAaveIncentivesController", "address": "0xd784927ff2f95ba542bfc824c8a8a98f3495f6b5"}, - "aaveLendingPool" : {"artifactName" : "ILendingPool", "address": "0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9"}, - "aaveRaiPCVDeposit": {"artifactName" : "AavePCVDeposit", "address": "0xd2174d78637a40448112aa6B30F9B19e6CF9d1F9"}, - "aaveTribeIncentivesController" : {"artifactName": "IAaveIncentivesController", "address": "0xDee5c1662bBfF8f80f7c572D8091BF251b3B0dAB"}, - "aaveTribeIncentivesControllerProxy" : {"artifactName": "TransparentUpgradeableProxy", "address": "0xDee5c1662bBfF8f80f7c572D8091BF251b3B0dAB"}, - "aaveTribeIncentivesControllerImpl" : {"artifactName": "IAaveIncentivesController", "address": "0xFF865335401F12B88fa3FF5A3a51685A7f224191"}, - "aFei" : {"artifactName" : "IERC20", "address": "0x683923dB55Fead99A79Fa01A27EeC3cB19679cC3"}, - "aFeiStableDebt" : {"artifactName" : "IERC20", "address": "0xd89cF9E8A858F8B4b31Faf793505e112d6c17449"}, - "aFeiVariableDebt" : {"artifactName" : "IERC20", "address": "0xC2e10006AccAb7B45D9184FcF5b7EC7763f5BaAe"}, - "aRai" : {"artifactName": "IERC20", "address": "0xc9BC48c72154ef3e5425641a3c747242112a46AF"}, - "aWETH" : {"artifactName": "IERC20", "address": "0x030bA81f1c18d280636F32af80b9AAd02Cf0854e"}, - "balancerAdmin" : {"artifactName": "unknown", "address" : "0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f"}, - "balancerAuthorizer" : {"artifactName": "Permissions", "address" : "0xA331D84eC860Bf466b4CdCcFb4aC09a1B43F3aE6"}, - "balancerLBPoolFactory" : {"artifactName" : "ILiquidityBootstrappingPoolFactory", "address": "0x751A0bC0e3f75b38e01Cf25bFCE7fF36DE1C87DE"}, - "balancerVault" : {"artifactName": "IVault", "address" : "0xBA12222222228d8Ba445958a75a0704d566BF2C8"}, - "bentoBox" : { "artifactName" : "IMasterContractManager", "address" : "0xF5BCE5077908a1b7370B9ae04AdC565EBd643966" }, - "bondingCurve": { "artifactName": "BondingCurve", "address": "0xe1578B4a32Eaefcd563a9E6d0dc02a4213f673B7"}, - "chainlinkDaiUsdOracle": { "artifactName": "unknown", "address": "0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9"}, - "chainlinkDaiUsdOracleWrapper": { "artifactName": "ChainlinkOracleWrapper", "address": "0x231aDa12E273eDf3fA54CbD90c5C1a73129D5bb9"}, - "chainlinkDpiUsdOracle": { "artifactName": "unknown", "address": "0xD2A593BF7594aCE1faD597adb697b5645d5edDB2"}, - "chainlinkDpiUsdOracleWrapper": { "artifactName": "ChainlinkOracleWrapper", "address": "0xB594d2bd55Ede471e16b92AE6F7651648DA871c3"}, - "chainlinkEthUsdOracle": { "artifactName": "unknown", "address": "0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419"}, - "chainlinkEthUsdOracleWrapper": { "artifactName": "ChainlinkOracleWrapper", "address": "0xCd3c40AE1256922BA16C7872229385E20Bc8351e"}, - "chainlinkFeiEthOracle": { "artifactName": "unknown", "address": "0x7F0D2c2838c6AC24443d13e23d99490017bDe370"}, - "chainlinkFeiEthOracleWrapper": { "artifactName": "ChainlinkOracleWrapper", "address": "0x060Be7B51F78DFFd04749332fd306BA1228e7444"}, - "chainlinkRaiEthOracle": { "artifactName": "unknown", "address": "0x4ad7B025127e89263242aB68F0f9c4E5C033B489"}, - "chainlinkRaiEthOracleWrapper": { "artifactName": "ChainlinkOracleWrapper", "address": "0x3d49573ee6aFCBDe606F8a1c2AA1C498048E7190"}, - "chainlinkRaiUsdCompositOracle": { "artifactName": "CompositeOracle", "address": "0x392b1d29eDab680c5CA778D3A32b8284859BFBB0"}, - "chainlinkTribeEthOracle": {"artifactName": "unknown", "address": "0x84a24deCA415Acc0c395872a9e6a63E27D6225c8"}, - "communalFarm" : {"artifactName": "unknown", "address": "0x0639076265e9f88542C91DCdEda65127974A5CA5"}, - "compositeOracle": { "artifactName": "CompositeOracle", "address": "0x8721f9EAba0B9081069970bCBce38763D3D4f28E"}, - "compoundDai" : {"artifactName": "unknown", "address" : "0x5d3a536e4d6dbd6114cc1ead35777bab948e3643"}, - "compoundDaiPCVDeposit" : { "artifactName": "ERC20CompoundPCVDeposit", "address" : "0xe0f73b8d76D2Ad33492F995af218b03564b8Ce20"}, - "compoundEth" : {"artifactName": "unknown", "address" : "0x4Ddc2D193948926D02f9B1fE9e1daa0718270ED5" }, - "compoundEthPCVDeposit" : { "artifactName" : "EthCompoundPCVDeposit", "address" : "0x4fCB1435fD42CE7ce7Af3cB2e98289F79d2962b3" }, - "compoundEthPCVDripController": { "artifactName": "PCVDripController", "address": "0xa84C8be28f3d560059339f06C6b6c5B23f53C58C"}, - "core": { "artifactName": "Core", "address": "0x8d5ED43dCa8C2F7dFB20CF7b53CC7E593635d7b9" }, - "creamFei" : { "artifactName" : "CErc20Delegator", "address": "0x8C3B7a4320ba70f8239F83770c4015B5bc4e6F91" }, - "creamFeiPCVDeposit" : { "artifactName" : "ERC20CompoundPCVDeposit", "address": "0x243C601CC5DaA3Ac250B14509804188347bd2aFB" }, - "curve3crv": { "artifactName": "IStableSwap3", "address": "0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490"}, - "curve3pool": { "artifactName": "IStableSwap3", "address": "0xbebc44782c7db0a1a60cb6fe97d0b483032ff1c7"}, - "curveMetapool": { "artifactName": "IStableSwap2", "address": "0x06cb22615ba53e60d67bf6c341a0fd5e718e1655"}, - "curve3Metapool": {"artifactName" : "IERC20", "address": "0x06cb22615BA53E60D67Bf6C341a0fD5E718E1655" }, - "dai" : {"artifactName" : "IERC20", "address" : "0x6B175474E89094C44Da98b954EedeAC495271d0F"}, - "daiBondingCurve": { "artifactName": "BondingCurve", "address": "0xC0afe0E649e32528666F993ce63822c3840e941a"}, - "defiPulseOTC" : {"artifactName": "unknown", "address" : "0x673d140eed36385cb784e279f8759f495c97cf03" }, - "dpi" : {"artifactName" : "IERC20", "address" : "0x1494CA1F11D487c2bBe4543E90080AeBa4BA3C2b"}, - "dpiBondingCurve": { "artifactName": "BondingCurve", "address": "0xBf5721c5E1C370f6F1A3E21b3972E0AcE93A1E84"}, - "dpiUniswapPCVDeposit": { "artifactName": "UniswapPCVDeposit", "address": "0x90fA375B75A58bB3A4842603f712DB285CC82Bf6"}, - "erc20Dripper" : { "artifactName": "ERC20Dripper", "address": "0x3Fe0EAD3500e767F0F8bC2d3B5AF7755B1b21A6a"}, - "ethLidoPCVDeposit" : { "artifactName": "EthLidoPCVDeposit", "address": "0xac38ee05c0204a1e119c625d0a560d6731478880"}, - "ethOTCEscrow" : { "artifactName": "OtcEscrow", "address": "0x6Cfed416f0729d5754f13fDDf297789079208E2e"}, - "ethPCVDripper" : { "artifactName": "IPCVDeposit", "address": "0xDa079A280FC3e33Eb11A78708B369D5Ca2da54fE"}, - "ethReserveStabilizer": { "artifactName": "EthReserveStabilizer", "address": "0x17305f0e18318994a57b494078CAC866A857F7b6"}, - "fei": { "artifactName": "Fei", "address": "0x956F47F50A910163D8BF957Cf5846D573E7f87CA"}, - "feiEthPair": { "artifactName": "IUniswapV2Pair", "address": "0x94B0A3d511b6EcDb17eBF877278Ab030acb0A878"}, - "feiOTCEscrow" : { "artifactName": "OtcEscrow", "address": "0x9B9fE1b732839a53948B02E5164c0A50fdf11e06"}, - "feiRewardsDistributor" : { "artifactName": "IFeiRewardsDistributor", "address": "0xEf1a94AF192A88859EAF3F3D8C1B9705542174C5"}, - "feiTribePair": { "artifactName": "IUniswapV2Pair", "address": "0x9928e4046d7c6513326cCeA028cD3e7a91c7590A"}, - "governorAlpha": { "artifactName": "GovernorAlpha", "address": "0xE087F94c3081e1832dC7a22B48c6f2b5fAaE579B"}, - "gUniFeiDaiLP": { "artifactName": "unknown", "address": "0x3D1556e84783672f2a3bd187a592520291442539"}, - "index" : { "artifactName": "IERC20", "address" : "0x0954906da0Bf32d5479e25f46056d22f08464cab" }, - "indexCoopFusePoolDpi" : {"artifactName" : "CErc20Delegator", "address" : "0xf06f65a6b7d2c401fcb8b3273d036d21fe2a5963"}, - "indexCoopFusePoolDpiPCVDeposit" : { "artifactName" : "ERC20CompoundPCVDeposit", "address" : "0x3dD3d945C4253bAc5B4Cc326a001B7d3f9C4DD66" }, - "indexCoopFusePoolFei" : { "artifactName" : "CErc20Delegator", "address" : "0x04281F6715Dea6A8EbBCE143D86ea506FF326531" }, - "indexCoopFusePoolFeiPCVDeposit" : { "artifactName" : "ERC20CompoundPCVDeposit", "address" : "0xD6960adba53212bBE96E54a7AFeDA2066437D000" }, - "indexDelegator" : { "artifactName": "SnapshotDelegatorPCVDeposit", "address": "0x0ee81df08B20e4f9E0F534e50da437D24491c4ee" }, - "kashiFeiDPI" : { "artifactName" : "IKashiPair", "address": "0xf352773f1d4d69deb4de8d0578e43b993ee76e5d" }, - "kashiFeiEth" : { "artifactName" : "IKashiPair", "address": "0x329efec40f58054fc2f2cd4fd65809f2be3e11c8" }, - "kashiFeiTribe" : { "artifactName" : "IKashiPair", "address": "0x18c9584d9ce56a0f62f73f630f180d5278c873b7" }, - "kashiFeiXSushi" : { "artifactName" : "IKashiPair", "address": "0xf2028069cd88f75fcbcfe215c70fe6d77cb80b10" }, - "masterKashi" : { "artifactName": "unknown", "address" : "0x2cba6ab6574646badc84f0544d05059e57a5dc42" }, - "multisend" : { "artifactName" : "IERC20Airdropper", "address": "0x0B36b0F351ea8383506F596743a2DA7DCa204cc3" }, - "multisig": { "artifactName": "unknown", "address": "0xB8f482539F2d3Ae2C9ea6076894df36D1f632775"}, - "oldEthReserveStabilizer": { "artifactName": "EthReserveStabilizer", "address": "0xa08A721dFB595753FFf335636674D76C455B275C"}, - "optimisticTimelock" : { "artifactName": "OptimisticTimelock", "address" : "0xbC9C084a12678ef5B516561df902fdc426d95483"}, - "poolPartyFei" : { "artifactName" : "CErc20Delegator", "address": "0x17b1A2E012cC4C31f83B90FF11d3942857664efc" }, - "poolPartyFeiPCVDeposit" : { "artifactName" : "ERC20CompoundPCVDeposit", "address": "0x5A8CB4556e5D5935Af06beab8292905f48131479" }, - "proxyAdmin" : { "artifactName" : "ProxyAdmin", "address": "0xf8c2b645988b7658E7748BA637fE25bdD46A704A"}, - "rai": {"artifactName" : "IERC20", "address" : "0x03ab458634910AaD20eF5f1C8ee96F1D6ac54919"}, - "raiBondingCurve": { "artifactName": "BondingCurve", "address": "0x25d60212D47Dd8F6Ff0469367E4c6C98Cd3411A5"}, - "rariPool19Dpi": { "artifactName" : "CErc20Delegator", "address": "0xf06f65a6b7d2c401fcb8b3273d036d21fe2a5963"}, - "rariPool19DpiPCVDeposit": { "artifactName" : "ERC20CompoundPCVDeposit", "address": "0x3dD3d945C4253bAc5B4Cc326a001B7d3f9C4DD66"}, - "rariPool18Fei": { "artifactName" : "CErc20Delegator", "address": "0x17b1A2E012cC4C31f83B90FF11d3942857664efc"}, - "rariPool18FeiPCVDeposit": { "artifactName" : "ERC20CompoundPCVDeposit", "address": "0x5A8CB4556e5D5935Af06beab8292905f48131479"}, - "rariPool19Fei": { "artifactName" : "CErc20Delegator", "address": "0x04281F6715Dea6A8EbBCE143D86ea506FF326531"}, - "rariPool19FeiPCVDeposit": { "artifactName" : "ERC20CompoundPCVDeposit", "address": "0xD6960adba53212bBE96E54a7AFeDA2066437D000"}, - "rariPool22Fei": { "artifactName" : "CErc20Delegator", "address": "0x653A32ED7AaA3DB37520125CDB45c17AdB3fdF01"}, - "rariPool22FeiPCVDeposit": { "artifactName" : "ERC20CompoundPCVDeposit", "address": "0x7CeBaB7b4B4399343f6D0D36B550EE097F60d7fE"}, - "rariPool24Fei": { "artifactName" : "CErc20Delegator", "address": "0xb5A817E5354736eafe3A0C85620433eE75daA649"}, - "rariPool24FeiPCVDeposit": { "artifactName" : "ERC20CompoundPCVDeposit", "address": "0x1434F99EDB2bD03DECCCFe21288767b8324B7403"}, - "rariPool25Fei": { "artifactName" : "CErc20Delegator", "address": "0xE468D0244D75b9b18B27cb682AeC3ab35d33663B"}, - "rariPool25FeiPCVDeposit": { "artifactName" : "ERC20CompoundPCVDeposit", "address": "0xe1662531aA5de1DAD8ab5B5756b8F6c8F3C759Ca"}, - "rariPool26Fei": { "artifactName" : "CErc20Delegator", "address": "0x38ee94FcF276Cee403f4645341f80e671d25b352"}, - "rariPool26FeiPCVDeposit": { "artifactName" : "ERC20CompoundPCVDeposit", "address": "0xFdCc96967C86250f333cE52Ba706Ec2961c3302f"}, - "rariPool27Fei": { "artifactName" : "CErc20Delegator", "address": "0xda396c927e3e6BEf77A98f372CE431b49EdEc43D"}, - "rariPool27FeiPCVDeposit": { "artifactName" : "ERC20CompoundPCVDeposit", "address": "0x91f50E3183a8CC30D2A981C3aFA85A2Bf6691c67"}, - "rariPool6Fei": { "artifactName" : "CErc20Delegator", "address": "0x185Ab80A77D362447415a5B347D7CD86ecaCC87C"}, - "rariPool6FeiPCVDeposit": { "artifactName" : "ERC20CompoundPCVDeposit", "address": "0xB51f09B6F103D697dc5d64DC904Ad6a2Dad39987"}, - "rariPool7Fei": { "artifactName" : "CErc20Delegator", "address": "0xE640E9beC342B86266B2bD79F3847e7958cb30C4"}, - "rariPool7FeiPCVDeposit": { "artifactName" : "ERC20CompoundPCVDeposit", "address": "0x74B235Fef146cDB5BE0D3786a9f3774674b3615E"}, - "rariPool8Comptroller": { "artifactName" : "Unitroller", "address": "0xc54172e34046c1653d1920d40333dd358c7a1af4"}, - "rariPool8Dai": { "artifactName" : "CErc20Delegator", "address": "0x7e9cE3CAa9910cc048590801e64174957Ed41d43" }, - "rariPool8DaiIrm": {"artifactName": "unknown", "address": "0xede47399e2aa8f076d40dc52896331cba8bd40f7" }, - "rariPool8Eth": {"artifactName": "CErc20Delegator", "address": "0xbB025D470162CC5eA24daF7d4566064EE7f5F111"}, - "rariPool8EthIrm": {"artifactName": "unknown", "address": "0xbab47e4b692195bf064923178a90ef999a15f819" }, - "rariPool8Fei": { "artifactName" : "CErc20Delegator", "address": "0xd8553552f8868C1Ef160eEdf031cF0BCf9686945"}, - "rariPool8FeiIrm": {"artifactName": "unknown", "address": "0x8f47be5692180079931e2f983db6996647aba0a5" }, - "rariPool8FeiPCVDeposit": { "artifactName" : "ERC20CompoundPCVDeposit", "address": "0x37349d9cc523D28e6aBFC03fc5F44879bC8BfFD9"}, - "rariPool8Tribe": { "artifactName" : "CErc20Delegator", "address": "0xFd3300A9a74b3250F1b2AbC12B47611171910b07"}, - "rariPool8TribeIrm": {"artifactName": "unknown", "address": "0x075538650a9c69ac8019507a7dd1bd879b12c1d7" }, - "rariPool9Fei": { "artifactName" : "CErc20Delegator", "address": "0x11A9F6ae6B36B4b820777D05B90Cd6CCCB1CDa31"}, - "rariPool9FeiPCVDeposit": { "artifactName" : "ERC20CompoundPCVDeposit", "address": "0xF2D8beE45f29A779cFB9F04ac233E703974a2C53"}, - "rariPool9Rai": { "artifactName" : "CErc20Delegator", "address": "0x752F119bD4Ee2342CE35E2351648d21962c7CAfE"}, - "rariPool9RaiPCVDeposit": { "artifactName" : "ERC20CompoundPCVDeposit", "address": "0x9aAdFfe00eAe6d8e59bB4F7787C6b99388A6960D"}, - "ratioPCVController": { "artifactName": "RatioPCVController", "address": "0xfC1aD6eb84351597cD3b9B65179633697d65B920"}, - "reflexerStableAssetFusePoolRai" : {"artifactName" : "CErc20Delegator", "address" : "0x752F119bD4Ee2342CE35E2351648d21962c7CAfE"}, - "reflexerStableAssetFusePoolRaiPCVDeposit" : { "artifactName" : "ERC20CompoundPCVDeposit", "address" : "0x9aAdFfe00eAe6d8e59bB4F7787C6b99388A6960D" }, - "snapshotDelegateRegistry" : { "artifactName": "DelegateRegistry", "address" : "0x469788fE6E9E9681C6ebF3bF78e7Fd26Fc015446" }, - "fAAVE" : {"artifactName" : "IERC20", "address": "0x4da27a545c0c5b758a6ba100e3a049001de870f5" }, - "stAAVE" : {"artifactName" : "IERC20", "address": "0x4da27a545c0c5b758a6ba100e3a049001de870f5" }, - "steth" : { "artifactName": "IERC20", "address": "0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84"}, - "sushiswapDpiFei" : {"artifactName" : "IUniswapV2Pair", "address": "0x8775aE5e83BC5D926b6277579c2B0d40c7D9b528" }, - "sushiswapRouter" : { "artifactName": "unknown", "address": "0xd9e1cE17f2641f24aE83637ab66a2cca9C378B9F"}, - "timelock": { "artifactName": "Timelock", "address": "0x639572471f2f318464dc01066a56867130e45E25"}, - "tribalChief" : { "artifactName": "TribalChief", "address": "0x9e1076cC0d19F9B0b8019F384B0a29E48Ee46f7f"}, - "tribalChiefImpl" : { "artifactName": "TribalChief", "address": "0x2d91362e8bcAA8826b482B531dcb170FC9d17777"}, - "tribalChiefOptimisticMultisig" : {"artifactName": "unknown", "address": "0x35ED000468f397AA943009bD60cc6d2d9a7d32fF"}, - "tribalChiefOptimisticTimelock" : {"artifactName": "Timelock", "address": "0x27Fae9E49AD955A24bB578B66Cdc962b5029fbA9"}, - "tribe": { "artifactName": "Tribe", "address": "0xc7283b66Eb1EB5FB86327f08e1B5816b0720212B"}, - "tribeOTCEscrow" : { "artifactName": "OtcEscrow", "address": "0xe2fE8041429e4bd51c40F92C6cDb699527171298"}, - "tribeReserveStabilizer" : { "artifactName": "TribeReserveStabilizer", "address": "0xa08A721dFB595753FFf335636674D76C455B275C"}, - "uniswapOracle": { "artifactName": "UniswapOracle", "address": "0x087F35bd241e41Fc28E43f0E8C58d283DD55bD65"}, - "uniswapPCVController": { "artifactName": "unknown", "address": "0x0760dfe09bd6d04d0df9a60c51f01ecedceb5132"}, - "uniswapPCVDeposit": { "artifactName": "UniswapPCVDeposit", "address": "0x5d6446880fcd004c851ea8920a628c70ca101117"}, - "uniswapRouter": {"artifactName": "unknown", "address": "0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D"}, - "weth": { "artifactName": "IWETH", "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"}, - "wethERC20": { "artifactName": "IERC20", "address": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"} -} diff --git a/contract-addresses/mainnetAddresses.ts b/contract-addresses/mainnetAddresses.ts new file mode 100644 index 000000000..5a7eae3cb --- /dev/null +++ b/contract-addresses/mainnetAddresses.ts @@ -0,0 +1,261 @@ +const MainnetAddresses = { + aave: { artifactName: 'IERC20', address: '0x7Fc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9' }, + aaveEthPCVDeposit: { artifactName: 'AavePCVDeposit', address: '0x5B86887e171bAE0C2C826e87E34Df8D558C079B9' }, + aaveEthPCVDripController: { + artifactName: 'PCVDripController', + address: '0xb3D63876d95d3a5e591D4DE536dC410b97244086' + }, + aaveFeiPCVDeposit: { artifactName: 'AavePCVDeposit', address: '0xaFBd7Bd91B4c1Dd289EE47a4F030FBeDfa7ABc12' }, + aaveGovernanceV2: { artifactName: 'IAaveGovernanceV2', address: '0xEC568fffba86c094cf06b22134B23074DFE2252c' }, + aaveIncentivesController: { + artifactName: 'IAaveIncentivesController', + address: '0xd784927ff2f95ba542bfc824c8a8a98f3495f6b5' + }, + aaveLendingPool: { artifactName: 'ILendingPool', address: '0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9' }, + aaveRaiPCVDeposit: { artifactName: 'AavePCVDeposit', address: '0xd2174d78637a40448112aa6B30F9B19e6CF9d1F9' }, + aaveTribeIncentivesController: { + artifactName: 'IAaveIncentivesController', + address: '0xDee5c1662bBfF8f80f7c572D8091BF251b3B0dAB' + }, + aaveTribeIncentivesControllerProxy: { + artifactName: 'TransparentUpgradeableProxy', + address: '0xDee5c1662bBfF8f80f7c572D8091BF251b3B0dAB' + }, + aaveTribeIncentivesControllerImpl: { + artifactName: 'IAaveIncentivesController', + address: '0xFF865335401F12B88fa3FF5A3a51685A7f224191' + }, + aFei: { artifactName: 'IERC20', address: '0x683923dB55Fead99A79Fa01A27EeC3cB19679cC3' }, + aFeiStableDebt: { artifactName: 'IERC20', address: '0xd89cF9E8A858F8B4b31Faf793505e112d6c17449' }, + aFeiVariableDebt: { artifactName: 'IERC20', address: '0xC2e10006AccAb7B45D9184FcF5b7EC7763f5BaAe' }, + aRai: { artifactName: 'IERC20', address: '0xc9BC48c72154ef3e5425641a3c747242112a46AF' }, + aWETH: { artifactName: 'IERC20', address: '0x030bA81f1c18d280636F32af80b9AAd02Cf0854e' }, + balancerAdmin: { artifactName: 'unknown', address: '0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f' }, + balancerAuthorizer: { artifactName: 'Permissions', address: '0xA331D84eC860Bf466b4CdCcFb4aC09a1B43F3aE6' }, + balancerLBPoolFactory: { + artifactName: 'ILiquidityBootstrappingPoolFactory', + address: '0x751A0bC0e3f75b38e01Cf25bFCE7fF36DE1C87DE' + }, + balancerVault: { artifactName: 'IVault', address: '0xBA12222222228d8Ba445958a75a0704d566BF2C8' }, + bentoBox: { artifactName: 'IMasterContractManager', address: '0xF5BCE5077908a1b7370B9ae04AdC565EBd643966' }, + bondingCurve: { artifactName: 'BondingCurve', address: '0xe1578B4a32Eaefcd563a9E6d0dc02a4213f673B7' }, + chainlinkDaiUsdOracle: { artifactName: 'unknown', address: '0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9' }, + chainlinkDaiUsdOracleWrapper: { + artifactName: 'ChainlinkOracleWrapper', + address: '0x231aDa12E273eDf3fA54CbD90c5C1a73129D5bb9' + }, + chainlinkDpiUsdOracle: { artifactName: 'unknown', address: '0xD2A593BF7594aCE1faD597adb697b5645d5edDB2' }, + chainlinkDpiUsdOracleWrapper: { + artifactName: 'ChainlinkOracleWrapper', + address: '0xB594d2bd55Ede471e16b92AE6F7651648DA871c3' + }, + chainlinkEthUsdOracle: { artifactName: 'unknown', address: '0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419' }, + chainlinkEthUsdOracleWrapper: { + artifactName: 'ChainlinkOracleWrapper', + address: '0xCd3c40AE1256922BA16C7872229385E20Bc8351e' + }, + chainlinkFeiEthOracle: { artifactName: 'unknown', address: '0x7F0D2c2838c6AC24443d13e23d99490017bDe370' }, + chainlinkFeiEthOracleWrapper: { + artifactName: 'ChainlinkOracleWrapper', + address: '0x060Be7B51F78DFFd04749332fd306BA1228e7444' + }, + chainlinkRaiEthOracle: { artifactName: 'unknown', address: '0x4ad7B025127e89263242aB68F0f9c4E5C033B489' }, + chainlinkRaiEthOracleWrapper: { + artifactName: 'ChainlinkOracleWrapper', + address: '0x3d49573ee6aFCBDe606F8a1c2AA1C498048E7190' + }, + chainlinkRaiUsdCompositOracle: { + artifactName: 'CompositeOracle', + address: '0x392b1d29eDab680c5CA778D3A32b8284859BFBB0' + }, + chainlinkTribeEthOracle: { artifactName: 'unknown', address: '0x84a24deCA415Acc0c395872a9e6a63E27D6225c8' }, + communalFarm: { artifactName: 'unknown', address: '0x0639076265e9f88542C91DCdEda65127974A5CA5' }, + compositeOracle: { artifactName: 'CompositeOracle', address: '0x8721f9EAba0B9081069970bCBce38763D3D4f28E' }, + compoundDai: { artifactName: 'unknown', address: '0x5d3a536e4d6dbd6114cc1ead35777bab948e3643' }, + compoundDaiPCVDeposit: { + artifactName: 'ERC20CompoundPCVDeposit', + address: '0xe0f73b8d76D2Ad33492F995af218b03564b8Ce20' + }, + compoundEth: { artifactName: 'unknown', address: '0x4Ddc2D193948926D02f9B1fE9e1daa0718270ED5' }, + compoundEthPCVDeposit: { + artifactName: 'EthCompoundPCVDeposit', + address: '0x4fCB1435fD42CE7ce7Af3cB2e98289F79d2962b3' + }, + compoundEthPCVDripController: { + artifactName: 'PCVDripController', + address: '0xa84C8be28f3d560059339f06C6b6c5B23f53C58C' + }, + core: { artifactName: 'Core', address: '0x8d5ED43dCa8C2F7dFB20CF7b53CC7E593635d7b9' }, + creamFei: { artifactName: 'CErc20Delegator', address: '0x8C3B7a4320ba70f8239F83770c4015B5bc4e6F91' }, + creamFeiPCVDeposit: { + artifactName: 'ERC20CompoundPCVDeposit', + address: '0x243C601CC5DaA3Ac250B14509804188347bd2aFB' + }, + curve3crv: { artifactName: 'IStableSwap3', address: '0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490' }, + curve3pool: { artifactName: 'IStableSwap3', address: '0xbebc44782c7db0a1a60cb6fe97d0b483032ff1c7' }, + curveMetapool: { artifactName: 'IStableSwap2', address: '0x06cb22615ba53e60d67bf6c341a0fd5e718e1655' }, + curve3Metapool: { artifactName: 'IERC20', address: '0x06cb22615BA53E60D67Bf6C341a0fD5E718E1655' }, + dai: { artifactName: 'IERC20', address: '0x6B175474E89094C44Da98b954EedeAC495271d0F' }, + daiBondingCurve: { artifactName: 'BondingCurve', address: '0xC0afe0E649e32528666F993ce63822c3840e941a' }, + defiPulseOTC: { artifactName: 'unknown', address: '0x673d140eed36385cb784e279f8759f495c97cf03' }, + dpi: { artifactName: 'IERC20', address: '0x1494CA1F11D487c2bBe4543E90080AeBa4BA3C2b' }, + dpiBondingCurve: { artifactName: 'BondingCurve', address: '0xBf5721c5E1C370f6F1A3E21b3972E0AcE93A1E84' }, + dpiUniswapPCVDeposit: { artifactName: 'UniswapPCVDeposit', address: '0x90fA375B75A58bB3A4842603f712DB285CC82Bf6' }, + erc20Dripper: { artifactName: 'ERC20Dripper', address: '0x3Fe0EAD3500e767F0F8bC2d3B5AF7755B1b21A6a' }, + ethLidoPCVDeposit: { artifactName: 'EthLidoPCVDeposit', address: '0xac38ee05c0204a1e119c625d0a560d6731478880' }, + ethOTCEscrow: { artifactName: 'OtcEscrow', address: '0x6Cfed416f0729d5754f13fDDf297789079208E2e' }, + ethPCVDripper: { artifactName: 'IPCVDeposit', address: '0xDa079A280FC3e33Eb11A78708B369D5Ca2da54fE' }, + ethReserveStabilizer: { artifactName: 'EthReserveStabilizer', address: '0x17305f0e18318994a57b494078CAC866A857F7b6' }, + fei: { artifactName: 'Fei', address: '0x956F47F50A910163D8BF957Cf5846D573E7f87CA' }, + feiEthPair: { artifactName: 'IUniswapV2Pair', address: '0x94B0A3d511b6EcDb17eBF877278Ab030acb0A878' }, + feiOTCEscrow: { artifactName: 'OtcEscrow', address: '0x9B9fE1b732839a53948B02E5164c0A50fdf11e06' }, + feiRewardsDistributor: { + artifactName: 'IFeiRewardsDistributor', + address: '0xEf1a94AF192A88859EAF3F3D8C1B9705542174C5' + }, + feiTribePair: { artifactName: 'IUniswapV2Pair', address: '0x9928e4046d7c6513326cCeA028cD3e7a91c7590A' }, + governorAlpha: { artifactName: 'GovernorAlpha', address: '0xE087F94c3081e1832dC7a22B48c6f2b5fAaE579B' }, + gUniFeiDaiLP: { artifactName: 'unknown', address: '0x3D1556e84783672f2a3bd187a592520291442539' }, + index: { artifactName: 'IERC20', address: '0x0954906da0Bf32d5479e25f46056d22f08464cab' }, + indexCoopFusePoolDpi: { artifactName: 'CErc20Delegator', address: '0xf06f65a6b7d2c401fcb8b3273d036d21fe2a5963' }, + indexCoopFusePoolDpiPCVDeposit: { + artifactName: 'ERC20CompoundPCVDeposit', + address: '0x3dD3d945C4253bAc5B4Cc326a001B7d3f9C4DD66' + }, + indexCoopFusePoolFei: { artifactName: 'CErc20Delegator', address: '0x04281F6715Dea6A8EbBCE143D86ea506FF326531' }, + indexCoopFusePoolFeiPCVDeposit: { + artifactName: 'ERC20CompoundPCVDeposit', + address: '0xD6960adba53212bBE96E54a7AFeDA2066437D000' + }, + indexDelegator: { + artifactName: 'SnapshotDelegatorPCVDeposit', + address: '0x0ee81df08B20e4f9E0F534e50da437D24491c4ee' + }, + kashiFeiDPI: { artifactName: 'IKashiPair', address: '0xf352773f1d4d69deb4de8d0578e43b993ee76e5d' }, + kashiFeiEth: { artifactName: 'IKashiPair', address: '0x329efec40f58054fc2f2cd4fd65809f2be3e11c8' }, + kashiFeiTribe: { artifactName: 'IKashiPair', address: '0x18c9584d9ce56a0f62f73f630f180d5278c873b7' }, + kashiFeiXSushi: { artifactName: 'IKashiPair', address: '0xf2028069cd88f75fcbcfe215c70fe6d77cb80b10' }, + masterKashi: { artifactName: 'unknown', address: '0x2cba6ab6574646badc84f0544d05059e57a5dc42' }, + multisend: { artifactName: 'IERC20Airdropper', address: '0x0B36b0F351ea8383506F596743a2DA7DCa204cc3' }, + multisig: { artifactName: 'unknown', address: '0xB8f482539F2d3Ae2C9ea6076894df36D1f632775' }, + oldEthReserveStabilizer: { + artifactName: 'EthReserveStabilizer', + address: '0xa08A721dFB595753FFf335636674D76C455B275C' + }, + optimisticTimelock: { artifactName: 'OptimisticTimelock', address: '0xbC9C084a12678ef5B516561df902fdc426d95483' }, + poolPartyFei: { artifactName: 'CErc20Delegator', address: '0x17b1A2E012cC4C31f83B90FF11d3942857664efc' }, + poolPartyFeiPCVDeposit: { + artifactName: 'ERC20CompoundPCVDeposit', + address: '0x5A8CB4556e5D5935Af06beab8292905f48131479' + }, + proxyAdmin: { artifactName: 'ProxyAdmin', address: '0xf8c2b645988b7658E7748BA637fE25bdD46A704A' }, + rai: { artifactName: 'IERC20', address: '0x03ab458634910AaD20eF5f1C8ee96F1D6ac54919' }, + raiBondingCurve: { artifactName: 'BondingCurve', address: '0x25d60212D47Dd8F6Ff0469367E4c6C98Cd3411A5' }, + rariPool19Dpi: { artifactName: 'CErc20Delegator', address: '0xf06f65a6b7d2c401fcb8b3273d036d21fe2a5963' }, + rariPool19DpiPCVDeposit: { + artifactName: 'ERC20CompoundPCVDeposit', + address: '0x3dD3d945C4253bAc5B4Cc326a001B7d3f9C4DD66' + }, + rariPool18Fei: { artifactName: 'CErc20Delegator', address: '0x17b1A2E012cC4C31f83B90FF11d3942857664efc' }, + rariPool18FeiPCVDeposit: { + artifactName: 'ERC20CompoundPCVDeposit', + address: '0x5A8CB4556e5D5935Af06beab8292905f48131479' + }, + rariPool19Fei: { artifactName: 'CErc20Delegator', address: '0x04281F6715Dea6A8EbBCE143D86ea506FF326531' }, + rariPool19FeiPCVDeposit: { + artifactName: 'ERC20CompoundPCVDeposit', + address: '0xD6960adba53212bBE96E54a7AFeDA2066437D000' + }, + rariPool22Fei: { artifactName: 'CErc20Delegator', address: '0x653A32ED7AaA3DB37520125CDB45c17AdB3fdF01' }, + rariPool22FeiPCVDeposit: { + artifactName: 'ERC20CompoundPCVDeposit', + address: '0x7CeBaB7b4B4399343f6D0D36B550EE097F60d7fE' + }, + rariPool24Fei: { artifactName: 'CErc20Delegator', address: '0xb5A817E5354736eafe3A0C85620433eE75daA649' }, + rariPool24FeiPCVDeposit: { + artifactName: 'ERC20CompoundPCVDeposit', + address: '0x1434F99EDB2bD03DECCCFe21288767b8324B7403' + }, + rariPool25Fei: { artifactName: 'CErc20Delegator', address: '0xE468D0244D75b9b18B27cb682AeC3ab35d33663B' }, + rariPool25FeiPCVDeposit: { + artifactName: 'ERC20CompoundPCVDeposit', + address: '0xe1662531aA5de1DAD8ab5B5756b8F6c8F3C759Ca' + }, + rariPool26Fei: { artifactName: 'CErc20Delegator', address: '0x38ee94FcF276Cee403f4645341f80e671d25b352' }, + rariPool26FeiPCVDeposit: { + artifactName: 'ERC20CompoundPCVDeposit', + address: '0xFdCc96967C86250f333cE52Ba706Ec2961c3302f' + }, + rariPool27Fei: { artifactName: 'CErc20Delegator', address: '0xda396c927e3e6BEf77A98f372CE431b49EdEc43D' }, + rariPool27FeiPCVDeposit: { + artifactName: 'ERC20CompoundPCVDeposit', + address: '0x91f50E3183a8CC30D2A981C3aFA85A2Bf6691c67' + }, + rariPool6Fei: { artifactName: 'CErc20Delegator', address: '0x185Ab80A77D362447415a5B347D7CD86ecaCC87C' }, + rariPool6FeiPCVDeposit: { + artifactName: 'ERC20CompoundPCVDeposit', + address: '0xB51f09B6F103D697dc5d64DC904Ad6a2Dad39987' + }, + rariPool7Fei: { artifactName: 'CErc20Delegator', address: '0xE640E9beC342B86266B2bD79F3847e7958cb30C4' }, + rariPool7FeiPCVDeposit: { + artifactName: 'ERC20CompoundPCVDeposit', + address: '0x74B235Fef146cDB5BE0D3786a9f3774674b3615E' + }, + rariPool8Comptroller: { artifactName: 'Unitroller', address: '0xc54172e34046c1653d1920d40333dd358c7a1af4' }, + rariPool8Dai: { artifactName: 'CErc20Delegator', address: '0x7e9cE3CAa9910cc048590801e64174957Ed41d43' }, + rariPool8DaiIrm: { artifactName: 'unknown', address: '0xede47399e2aa8f076d40dc52896331cba8bd40f7' }, + rariPool8Eth: { artifactName: 'CErc20Delegator', address: '0xbB025D470162CC5eA24daF7d4566064EE7f5F111' }, + rariPool8EthIrm: { artifactName: 'unknown', address: '0xbab47e4b692195bf064923178a90ef999a15f819' }, + rariPool8Fei: { artifactName: 'CErc20Delegator', address: '0xd8553552f8868C1Ef160eEdf031cF0BCf9686945' }, + rariPool8FeiIrm: { artifactName: 'unknown', address: '0x8f47be5692180079931e2f983db6996647aba0a5' }, + rariPool8FeiPCVDeposit: { + artifactName: 'ERC20CompoundPCVDeposit', + address: '0x37349d9cc523D28e6aBFC03fc5F44879bC8BfFD9' + }, + rariPool8Tribe: { artifactName: 'CErc20Delegator', address: '0xFd3300A9a74b3250F1b2AbC12B47611171910b07' }, + rariPool8TribeIrm: { artifactName: 'unknown', address: '0x075538650a9c69ac8019507a7dd1bd879b12c1d7' }, + rariPool9Fei: { artifactName: 'CErc20Delegator', address: '0x11A9F6ae6B36B4b820777D05B90Cd6CCCB1CDa31' }, + rariPool9FeiPCVDeposit: { + artifactName: 'ERC20CompoundPCVDeposit', + address: '0xF2D8beE45f29A779cFB9F04ac233E703974a2C53' + }, + rariPool9Rai: { artifactName: 'CErc20Delegator', address: '0x752F119bD4Ee2342CE35E2351648d21962c7CAfE' }, + rariPool9RaiPCVDeposit: { + artifactName: 'ERC20CompoundPCVDeposit', + address: '0x9aAdFfe00eAe6d8e59bB4F7787C6b99388A6960D' + }, + ratioPCVController: { artifactName: 'RatioPCVController', address: '0xfC1aD6eb84351597cD3b9B65179633697d65B920' }, + reflexerStableAssetFusePoolRai: { + artifactName: 'CErc20Delegator', + address: '0x752F119bD4Ee2342CE35E2351648d21962c7CAfE' + }, + reflexerStableAssetFusePoolRaiPCVDeposit: { + artifactName: 'ERC20CompoundPCVDeposit', + address: '0x9aAdFfe00eAe6d8e59bB4F7787C6b99388A6960D' + }, + snapshotDelegateRegistry: { artifactName: 'DelegateRegistry', address: '0x469788fE6E9E9681C6ebF3bF78e7Fd26Fc015446' }, + fAAVE: { artifactName: 'IERC20', address: '0x4da27a545c0c5b758a6ba100e3a049001de870f5' }, + stAAVE: { artifactName: 'IERC20', address: '0x4da27a545c0c5b758a6ba100e3a049001de870f5' }, + steth: { artifactName: 'IERC20', address: '0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84' }, + sushiswapDpiFei: { artifactName: 'IUniswapV2Pair', address: '0x8775aE5e83BC5D926b6277579c2B0d40c7D9b528' }, + sushiswapRouter: { artifactName: 'unknown', address: '0xd9e1cE17f2641f24aE83637ab66a2cca9C378B9F' }, + timelock: { artifactName: 'Timelock', address: '0x639572471f2f318464dc01066a56867130e45E25' }, + tribalChief: { artifactName: 'TribalChief', address: '0x9e1076cC0d19F9B0b8019F384B0a29E48Ee46f7f' }, + tribalChiefImpl: { artifactName: 'TribalChief', address: '0x2d91362e8bcAA8826b482B531dcb170FC9d17777' }, + tribalChiefOptimisticMultisig: { artifactName: 'unknown', address: '0x35ED000468f397AA943009bD60cc6d2d9a7d32fF' }, + tribalChiefOptimisticTimelock: { artifactName: 'Timelock', address: '0x27Fae9E49AD955A24bB578B66Cdc962b5029fbA9' }, + tribe: { artifactName: 'Tribe', address: '0xc7283b66Eb1EB5FB86327f08e1B5816b0720212B' }, + tribeOTCEscrow: { artifactName: 'OtcEscrow', address: '0xe2fE8041429e4bd51c40F92C6cDb699527171298' }, + tribeReserveStabilizer: { + artifactName: 'TribeReserveStabilizer', + address: '0xa08A721dFB595753FFf335636674D76C455B275C' + }, + uniswapOracle: { artifactName: 'UniswapOracle', address: '0x087F35bd241e41Fc28E43f0E8C58d283DD55bD65' }, + uniswapPCVController: { artifactName: 'unknown', address: '0x0760dfe09bd6d04d0df9a60c51f01ecedceb5132' }, + uniswapPCVDeposit: { artifactName: 'UniswapPCVDeposit', address: '0x5d6446880fcd004c851ea8920a628c70ca101117' }, + uniswapRouter: { artifactName: 'unknown', address: '0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D' }, + weth: { artifactName: 'IWETH', address: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2' }, + wethERC20: { artifactName: 'IERC20', address: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2' } +}; + +export default MainnetAddresses; diff --git a/proposals/README.md b/proposals/README.md index 7c7e561f6..58d59812e 100644 --- a/proposals/README.md +++ b/proposals/README.md @@ -40,10 +40,10 @@ If your proposal requires new code additions to succeed, these need to be develo ## Step 3: Proposal Mocking and Integration Test Write a script following the template of `proposals/dao/fip_x.js`. The script should use the injected `addresses`, `contracts`, and `oldContracts` parameters to trigger the appropriate governor functions with the intended inputs. -* `addresses` contains a flat mapping of address names to addresses found in `contract-addresses/mainnetAddresses.json` -* `contracts` contains a flat mapping of contract names to contract objects using the specified artifact and contract from `contract-addresses/mainnetAddresses.json` AFTER all of the deploy and upgrade steps have taken place +* `addresses` contains a flat mapping of address names to addresses found in `contract-addresses/mainnetAddresses` +* `contracts` contains a flat mapping of contract names to contract objects using the specified artifact and contract from `contract-addresses/mainnetAddresses` AFTER all of the deploy and upgrade steps have taken place -* `oldContracts` contains a flat mapping of contract names to contract objects using the specified artifact and contract from `contract-addresses/mainnetAddresses.json` from BEFORE all of the deploy and upgrade steps have taken place, in case actions need to be taken on the prior versions of upgraded contracts +* `oldContracts` contains a flat mapping of contract names to contract objects using the specified artifact and contract from `contract-addresses/mainnetAddresses` from BEFORE all of the deploy and upgrade steps have taken place, in case actions need to be taken on the prior versions of upgraded contracts The setup, teardown, and validation hooks are used to compare the output of the dao script to the actual on-chain calldata proposed to the governor. diff --git a/proposals/dao/fip_24.ts b/proposals/dao/fip_24.ts index cb8e07dd8..f59f6067f 100644 --- a/proposals/dao/fip_24.ts +++ b/proposals/dao/fip_24.ts @@ -12,7 +12,7 @@ import { web3, ethers } from 'hardhat'; */ /* Params: - addresses - all addresses in /contract-addresses/mainnetAddresses.json in an object of depth 1 + addresses - all addresses in /contract-addresses/mainnetAddresses in an object of depth 1 oldContracts - an object of Web3 contract instances using the contract state from BEFORE any upgrades contracts - an object of Web3 contract instances using the contract state from AFTER any upgrades for example if a new UniswapPCVDeposit is deployed, the new instance is in contracts and the old instance is in oldContracts diff --git a/proposals/dao/fip_28.ts b/proposals/dao/fip_28.ts index 29017c318..83352b680 100644 --- a/proposals/dao/fip_28.ts +++ b/proposals/dao/fip_28.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; import hre, { ethers } from 'hardhat'; -import { RunUpgradeFunc, SetupUpgradeFunc, TeardownUpgradeFunc } from '../../test/integration/setup/types'; +import { RunUpgradeFunc, SetupUpgradeFunc, TeardownUpgradeFunc } from '../../types/types'; const e18 = ethers.constants.WeiPerEther; diff --git a/proposals/dao/fip_x.ts b/proposals/dao/fip_x.ts index 513df6af1..749bbaf28 100644 --- a/proposals/dao/fip_x.ts +++ b/proposals/dao/fip_x.ts @@ -1,6 +1,6 @@ import hre, { ethers, artifacts } from 'hardhat'; import { expect } from 'chai'; -import { RunUpgradeFunc, SetupUpgradeFunc, TeardownUpgradeFunc } from '../../test/integration/setup/types'; +import { RunUpgradeFunc, SetupUpgradeFunc, TeardownUpgradeFunc } from '../../types/types'; /* diff --git a/proposals/dao/optimisticTimelock.ts b/proposals/dao/optimisticTimelock.ts index e4976cb28..358a8cdb6 100644 --- a/proposals/dao/optimisticTimelock.ts +++ b/proposals/dao/optimisticTimelock.ts @@ -1,12 +1,7 @@ import hre, { ethers } from 'hardhat'; import { expect } from 'chai'; import { time } from '../../test/helpers'; -import { - RunUpgradeFunc, - SetupUpgradeFunc, - TeardownUpgradeFunc, - ValidateUpgradeFunc -} from '../../test/integration/setup/types'; +import { RunUpgradeFunc, SetupUpgradeFunc, TeardownUpgradeFunc, ValidateUpgradeFunc } from '../../types/types'; const setup: SetupUpgradeFunc = async (addresses, oldContracts, contracts, logging) => { console.log('No actions to complete in setup.'); diff --git a/proposals/dao/v2Phase1.ts b/proposals/dao/v2Phase1.ts index 4bd3a5fee..2e0db279a 100644 --- a/proposals/dao/v2Phase1.ts +++ b/proposals/dao/v2Phase1.ts @@ -6,7 +6,7 @@ import { ValidateUpgradeFunc, RunUpgradeFunc, TeardownUpgradeFunc -} from '../../test/integration/setup/types'; +} from '../../types/types'; import chai from 'chai'; import { expect } from 'chai'; diff --git a/scripts/deploy/migrations.js b/scripts/deploy/migrations.js index 21885b6b9..2a0448451 100644 --- a/scripts/deploy/migrations.js +++ b/scripts/deploy/migrations.js @@ -1,4 +1,4 @@ -import mainnetAddressesV1 from '../../contract-addresses/mainnetAddresses.json'; +import mainnetAddressesV1 from '../../contract-addresses/mainnetAddresses'; const { ethers } = require('hardhat'); diff --git a/scripts/deploy/v2Phase1.ts b/scripts/deploy/v2Phase1.ts index 92979ed7a..e52e1304c 100644 --- a/scripts/deploy/v2Phase1.ts +++ b/scripts/deploy/v2Phase1.ts @@ -2,7 +2,7 @@ import { TransactionResponse } from '@ethersproject/abstract-provider'; import testHelpers, { BN, ether } from '@openzeppelin/test-helpers'; import hre, { artifacts, ethers, web3 } from 'hardhat'; import { getAllContractAddresses } from '../../test/integration/setup/loadContracts'; -import { DeployUpgradeFunc, NamedContracts } from '../../test/integration/setup/types'; +import { DeployUpgradeFunc, NamedContracts } from '../../types/types'; const { constants: { ZERO_ADDRESS } } = testHelpers; diff --git a/scripts/utils/checkProposal.ts b/scripts/utils/checkProposal.ts index 3b19dfc18..7701bbbba 100644 --- a/scripts/utils/checkProposal.ts +++ b/scripts/utils/checkProposal.ts @@ -1,7 +1,7 @@ import { getAllContracts, getAllContractAddresses } from '../../test/integration/setup/loadContracts'; import hre, { ethers } from 'hardhat'; import { time } from '@openzeppelin/test-helpers'; -import { NamedContracts, UpgradeFuncs } from '../../test/integration/setup/types'; +import { NamedContracts, UpgradeFuncs } from '../../types/types'; import * as dotenv from 'dotenv'; diff --git a/scripts/utils/sudo.ts b/scripts/utils/sudo.ts index 7e362b9a1..4c0373394 100644 --- a/scripts/utils/sudo.ts +++ b/scripts/utils/sudo.ts @@ -1,6 +1,6 @@ import hre, { network, ethers } from 'hardhat'; import { forceEth } from '../../test/integration/setup/utils'; -import { NamedContracts } from '../../test/integration/setup/types'; +import { NamedContracts } from '../../types/types'; import * as dotenv from 'dotenv'; diff --git a/scripts/utils/syncPool.ts b/scripts/utils/syncPool.ts index a68a48547..bf3e977aa 100644 --- a/scripts/utils/syncPool.ts +++ b/scripts/utils/syncPool.ts @@ -1,6 +1,6 @@ import hre, { ethers, artifacts } from 'hardhat'; import * as dotenv from 'dotenv'; -import { NamedAddresses } from '../../test/integration/setup/types'; +import { NamedAddresses } from '../../types/types'; dotenv.config(); diff --git a/test/integration/e2e.spec.ts b/test/integration/e2e.spec.ts index 8cb3d0524..84a33d815 100644 --- a/test/integration/e2e.spec.ts +++ b/test/integration/e2e.spec.ts @@ -1,7 +1,7 @@ import hre, { ethers } from 'hardhat'; import { time } from '@openzeppelin/test-helpers'; import { TestEndtoEndCoordinator } from './setup'; -import { NamedAddresses, NamedContracts } from './setup/types'; +import { NamedAddresses, NamedContracts } from '../../types/types'; import { forceEth } from './setup/utils'; import { expectApprox } from '../../test/helpers'; import proposals from './proposals_config.json'; @@ -213,7 +213,7 @@ describe('e2e', function () { }); }); - describe('Aave borrowing', async () => { + describe.skip('Aave borrowing', async () => { it('grants rewards', async function () { const { aaveEthPCVDeposit, aaveLendingPool, aaveTribeIncentivesController, fei, tribe } = contracts; diff --git a/test/integration/setup/index.ts b/test/integration/setup/index.ts index 433a9e538..8e8c543ab 100644 --- a/test/integration/setup/index.ts +++ b/test/integration/setup/index.ts @@ -8,7 +8,7 @@ import { ProposalConfig, namedContractsToNamedAddresses, NamedAddresses -} from './types'; +} from '../../../types/types'; import { sudo } from '../../../scripts/utils/sudo'; import constructProposal from '../../../scripts/utils/constructProposal'; import '@nomiclabs/hardhat-ethers'; @@ -20,7 +20,7 @@ import { RunUpgradeFunc, TeardownUpgradeFunc, ValidateUpgradeFunc -} from './types'; +} from '../../../types/types'; /** * Coordinate initialising an end-to-end testing environment diff --git a/test/integration/setup/loadContracts.ts b/test/integration/setup/loadContracts.ts index e02ba4fbb..fa416ebbf 100644 --- a/test/integration/setup/loadContracts.ts +++ b/test/integration/setup/loadContracts.ts @@ -1,6 +1,6 @@ -import mainnetAddresses from '../../../contract-addresses/mainnetAddresses.json'; +import mainnetAddresses from '../../../contract-addresses/mainnetAddresses'; import hre, { artifacts, ethers } from 'hardhat'; -import { MainnetContracts, NamedAddresses, NamedContracts } from './types'; +import { MainnetContracts, NamedAddresses, NamedContracts } from '../../../types/types'; const contractArtifacts = {}; diff --git a/test/integration/setup/types.ts b/test/integration/setup/types.ts deleted file mode 100644 index 66b67ef7c..000000000 --- a/test/integration/setup/types.ts +++ /dev/null @@ -1,178 +0,0 @@ -import { ethers } from 'ethers'; - -export type Env = { - contracts: NamedContracts; - contractAddresses: NamedAddresses; -}; - -export interface TestCoordinator { - loadEnvironment(): Promise; -} - -export function namedContractsToNamedAddresses(contracts: NamedContracts): NamedAddresses { - const namedAddresses: NamedAddresses = {}; - - Object.keys(contracts).map(function (contractName, index) { - namedAddresses[contractName] = contracts[contractName].address; - }); - - return namedAddresses; -} - -export type NamedContracts = { [key: string]: ethers.Contract }; -export type NamedAddresses = { [key: string]: string }; -export type DeployUpgradeFunc = ( - deployAddress: string, - address: NamedAddresses, - logging: boolean -) => Promise; -export type SetupUpgradeFunc = ( - addresses: NamedAddresses, - oldContracts: NamedContracts, - contracts: NamedContracts, - logging: boolean -) => Promise; -export type RunUpgradeFunc = ( - addresses: NamedAddresses, - oldContracts: NamedContracts, - contracts: NamedContracts, - logging: boolean -) => Promise; -export type TeardownUpgradeFunc = ( - addresses: NamedAddresses, - oldContracts: NamedContracts, - contracts: NamedContracts, - logging: boolean -) => Promise; -export type ValidateUpgradeFunc = ( - addresses: NamedAddresses, - oldContracts: NamedContracts, - contracts: NamedContracts, - logging: boolean -) => Promise; - -export type UpgradeFuncs = { - deploy: DeployUpgradeFunc; - setup: SetupUpgradeFunc; - run: RunUpgradeFunc; - teardown: TeardownUpgradeFunc; - validate: ValidateUpgradeFunc; -}; - -export type Config = { - version: number; - deployAddress: string; - logging: boolean; -}; - -export interface MainnetContracts { - core: ethers.Contract; - tribe: ethers.Contract; - fei: ethers.Contract; - uniswapPCVDeposit: ethers.Contract; - uniswapPCVController: ethers.Contract; - bondingCurve: ethers.Contract; - chainlinkEthUsdOracle: ethers.Contract; - chainlinkFeiEthOracle: ethers.Contract; - compositeOracle: ethers.Contract; - ethReserveStabilizer: ethers.Contract; - ratioPCVController: ethers.Contract; - tribeReserveStabilizer: ethers.Contract; - feiRewardsDistributor: ethers.Contract; - timelock: ethers.Contract; - feiEthPair: ethers.Contract; - rariPool8FeiPCVDeposit: ethers.Contract; - rariPool8EthPCVDeposit: ethers.Contract; - compoundEthPCVDeposit: ethers.Contract; - compoundDaiPCVDeposit: ethers.Contract; - curveMetapoolDeposit: ethers.Contract; - curveMetapool: ethers.Contract; - curve3pool: ethers.Contract; - curve3crv: ethers.Contract; - aaveEthPCVDeposit: ethers.Contract; - aaveRaiPCVDeposit: ethers.Contract; - stAAVE: ethers.Contract; - dpiBondingCurve: ethers.Contract; - daiBondingCurve: ethers.Contract; - dpi: ethers.Contract; - dai: ethers.Contract; - chainlinkDpiUsdOracleWrapper: ethers.Contract; - dpiUniswapPCVDeposit: ethers.Contract; - indexCoopFusePoolDpiPCVDeposit: ethers.Contract; - raiBondingCurve: ethers.Contract; - rai: ethers.Contract; - chainlinkRaiEthOracleWrapper: ethers.Contract; - chainlinkRaiUsdCompositOracle: ethers.Contract; - reflexerStableAssetFusePoolRaiPCVDeposit: ethers.Contract; - kashiFeiTribe: ethers.Contract; - bentoBox: ethers.Contract; - aaveEthPCVDripController: ethers.Contract; - governorAlpha: ethers.Contract; - tribalChief: ethers.Contract; - stakingTokenWrapper: ethers.Contract; - feiTribePair: ethers.Contract; - rariPool8Tribe: ethers.Contract; - curve3Metapool: ethers.Contract; - erc20Dripper: ethers.Contract; - tribalChiefOptimisticTimelock: ethers.Contract; - staticPcvDepositWrapper: ethers.Contract; - collateralizationOracle: ethers.Contract; - collateralizationOracleWrapper: ethers.Contract; - collateralizationOracleKeeper: ethers.Contract; - tribeReserveStabilizerAddress: ethers.Contract; - pcvEquityMinter: ethers.Contract; - tribeSplitter: ethers.Contract; - feiTribeLBPSwapper: ethers.Contract; - aaveLendingPool: ethers.Contract; - aaveTribeIncentivesController: ethers.Contract; - optimisticTimelock: ethers.Contract; -} - -export interface MainnetContractAddresses { - core: string; - tribe: string; - fei: string; - uniswapPCVDeposit: string; - uniswapPCVController: string; - bondingCurve: string; - chainlinkEthUsdOracle: string; - chainlinkFeiEthOracle: string; - compositeOracle: string; - compoundDai: string; - ethReserveStabilizer: string; - ratioPCVController: string; - weth: string; - uniswapRouter: string; - feiEthPair: string; - uniswapOracle: string; - feiRewardsDistributor: string; - tribeReserveStabilizer: string; - timelock: string; - multisig: string; - governorAlpha: string; - indexCoopFusePoolDpi: string; - reflexerStableAssetFusePoolRai: string; - bentoBox: string; - masterKashi: string; - feiTribePair: string; - rariPool8Tribe: string; - curve3Metapool: string; - tribalChiefOptimisticMultisig: string; -} - -export type ProposalConfig = { - deploy: boolean; - exec: boolean; - proposerAddress: string; - voterAddress: string; - proposal_calldata: string; - totalValue: number; -}; - -export type ContractAccessRights = { - minter: string[]; - burner: string[]; - governor: string[]; - pcvController: string[]; - guardian: string[]; -};