just before to deployment (#63)

.gitignore

@@ -31,7 +31,6 @@ gasReporterOutput.json
 addresses.json
 blockchain_db
 yarn-error.log
-broadcast
 
 # deployments
 deployments/localhost

contracts/interfaces/IAngleHelper.sol

@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: GPL-3.0
+
+pragma solidity ^0.8.12;
+
+struct PerpetualManagerFeeData {
+    uint64[] xHAFeesDeposit;
+    uint64[] yHAFeesDeposit;
+    uint64[] xHAFeesWithdraw;
+    uint64[] yHAFeesWithdraw;
+    uint64 haBonusMalusDeposit;
+    uint64 haBonusMalusWithdraw;
+}
+
+struct PerpetualManagerParamData {
+    uint64 maintenanceMargin;
+    uint64 maxLeverage;
+    uint64 targetHAHedge;
+    uint64 limitHAHedge;
+    uint64 lockTime;
+}
+
+struct CollateralAddresses {
+    address stableMaster;
+    address poolManager;
+    address perpetualManager;
+    address sanToken;
+    address oracle;
+    address gauge;
+    address feeManager;
+    address[] strategies;
+}
+
+interface IAngleHelper {
+    function getCollateralAddresses(address agToken, address collateral)
+        external
+        view
+        returns (CollateralAddresses memory addresses);
+
+    function getStablecoinAddresses() external view returns (address[] memory, address[] memory);
+
+    function getPoolManager(address agToken, address collateral) external view returns (address poolManager);
+}

contracts/strategies/BaseStrategyUpgradeable.sol

@@ -51,19 +51,12 @@ abstract contract BaseStrategyUpgradeable is BaseStrategyEvents, AccessControlAn
     uint256 public constant BASE = 10**18;
     uint256 public constant SECONDS_PER_YEAR = 31556952;
 
-    // /// @notice Role for `PoolManager` only - keccak256("POOLMANAGER_ROLE")
-    // bytes32 public constant POOLMANAGER_ROLE = 0x5916f72c85af4ac6f7e34636ecc97619c4b2085da099a5d28f3e58436cfbe562;
-    // /// @notice Role for guardians and governors - keccak256("GUARDIAN_ROLE")
-    // bytes32 public constant GUARDIAN_ROLE = 0x55435dd261a4b9b3364963f7738a7a662ad9c84396d64be3365284bb7f0a5041;
-    // /// @notice Role for keepers - keccak256("KEEPER_ROLE")
-    // bytes32 public constant KEEPER_ROLE = 0xfc8737ab85eb45125971625a9ebdb75cc78e01d5c1fa80c4c6e5203f47bc4fab;
-
-    /// @notice Role for `PoolManager` only
-    bytes32 public constant POOLMANAGER_ROLE = keccak256("POOLMANAGER_ROLE");
-    /// @notice Role for guardians and governors
-    bytes32 public constant GUARDIAN_ROLE = keccak256("GUARDIAN_ROLE");
-    /// @notice Role for keepers
-    bytes32 public constant KEEPER_ROLE = keccak256("KEEPER_ROLE");
+    /// @notice Role for `PoolManager` only - keccak256("POOLMANAGER_ROLE")
+    bytes32 public constant POOLMANAGER_ROLE = 0x5916f72c85af4ac6f7e34636ecc97619c4b2085da099a5d28f3e58436cfbe562;
+    /// @notice Role for guardians and governors - keccak256("GUARDIAN_ROLE")
+    bytes32 public constant GUARDIAN_ROLE = 0x55435dd261a4b9b3364963f7738a7a662ad9c84396d64be3365284bb7f0a5041;
+    /// @notice Role for keepers - keccak256("KEEPER_ROLE")
+    bytes32 public constant KEEPER_ROLE = 0xfc8737ab85eb45125971625a9ebdb75cc78e01d5c1fa80c4c6e5203f47bc4fab;
 
     // ================================= REFERENCES ================================
 

contracts/strategies/OptimizerAPR/OptimizerAPRStrategy.sol

@@ -160,10 +160,9 @@ contract OptimizerAPRStrategy is BaseStrategyUpgradeable {
         uint256 highestLenderNav;
         uint256 totalNav = looseAssets;
         uint256[] memory weightedAprs = new uint256[](lendersList.length);
-        uint256 lendersListLength = lendersList.length;
         {
             uint256 lowestApr = type(uint256).max;
-            for (uint256 i; i < lendersListLength; ++i) {
+            for (uint256 i; i < lendersList.length; ++i) {
                 uint256 aprAfterDeposit = lendersList[i].aprAfterDeposit(int256(looseAssets));
                 uint256 nav = lendersList[i].nav();
                 totalNav += nav;
@@ -192,10 +191,10 @@ contract OptimizerAPRStrategy is BaseStrategyUpgradeable {
             uint256 weightedApr1;
             // Case where funds are divested from the strategy with the lowest APR to be invested in the one with the highest APR
             uint256 weightedApr2;
-            for (uint256 i; i < lendersListLength; ++i) {
+            for (uint256 i; i < lendersList.length; ++i) {
                 if (i == _highest) {
                     weightedApr1 += (highestLenderNav + looseAssets) * highestApr;
-                    if (lowestNav != 0 && lendersListLength > 1)
+                    if (lowestNav != 0 && lendersList.length > 1)
                         weightedApr2 +=
                             (highestLenderNav + looseAssets + lowestNav) *
                             lendersList[_highest].aprAfterDeposit(int256(lowestNav + looseAssets));

deploy/OptimizerAPRStrategy.ts

@@ -0,0 +1,24 @@
+import { DeployFunction } from 'hardhat-deploy/types';
+import yargs from 'yargs';
+const argv = yargs.env('').boolean('ci').parseSync();
+
+const func: DeployFunction = async ({ deployments, ethers }) => {
+  const { deploy } = deployments;
+  const { deployer } = await ethers.getNamedSigners();
+
+  console.log('Now deploying the implementation for OptimizerAPRStrategy');
+  await deploy('OptimizerAPRStrategy_Implementation', {
+    contract: 'OptimizerAPRStrategy',
+    from: deployer.address,
+    args: [],
+    log: !argv.ci,
+  });
+
+  const optimizerAPRStrategyImplementation = (await ethers.getContract('OptimizerAPRStrategy_Implementation')).address;
+
+  console.log(`Successfully deployed the implementation for OptimizerAPR at ${optimizerAPRStrategyImplementation}`);
+  console.log('');
+};
+
+func.tags = ['optimizerAPRImplementation'];
+export default func;

deployments/polygon/.chainId

@@ -0,0 +1 @@
+137