resolved merge conflicts with feat/SolaceNative

Author: kyzooghost

contracts/airdrop/MerkleDistributor.sol

@@ -5,7 +5,6 @@ import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/utils/cryptography/MerkleProof.sol";
 import "../interfaces/airdrop/IMerkleDistributor.sol";
 import "../utils/Governable.sol";
-// import "hardhat/console.sol";
 
 contract MerkleDistributor is IMerkleDistributor, Governable {
     address public immutable override token; // Airdrop token
@@ -75,12 +74,4 @@ contract MerkleDistributor is IMerkleDistributor, Governable {
         if (!IERC20(token).transfer(governance, balance)) revert FailedGovernorRecover(balance);
         emit GovernorRecoverAirdropTokens(balance);
     }
-}
-
-// Useful resources
-
-// Modified from https://github.com/Uniswap/merkle-distributor/blob/master/contracts/MerkleDistributor.sol
-// https://github.com/Anish-Agnihotri/merkle-airdrop-starter/blob/master/contracts/src/MerkleClaimERC20.sol
-
-// Use Custom errors - https://blog.soliditylang.org/2021/04/21/custom-errors/ - instead of require strings
-// Cheaper in deploy and runtime costs, able to convey dynamic information
+}

contracts/interfaces/native/IGaugeController.sol

@@ -11,9 +11,9 @@ import "./GaugeStructs.sol";
  * Current gauge weights can be obtained through [`getGaugeWeight()`](#getgaugeweight) and [`getAllGaugeWeights()`](#getallgaugeweights)
  *
  * Only governance can make mutator calls to GaugeController.sol. There are no unpermissioned external mutator calls in this contract.
- * 
+ *
  * After every epoch, governance must call [`updateGaugeWeights()`](#updategaugeweights). This will process the last epoch's votes (stored in this contract).
- * 
+ *
  * Individual voters register and manage their vote through voting contracts that conform to IGaugeVoting.
  *
  * Governance can [`addGauge()`](#addgauge) or [`pauseGauge()`](#pausegauge).
@@ -27,7 +27,7 @@ interface IGaugeController {
     /// @notice Thrown when zero address is given as an argument.
     /// @param contractName Name of contract for which zero address was incorrectly provided.
     error ZeroAddressInput(string contractName);
-    
+
     /// @notice Thrown when array arguments are mismatched in length;
     error ArrayArgumentsLengthMismatch();
 
@@ -174,7 +174,7 @@ interface IGaugeController {
      * @return numPausedGauges
      */
     function getNumPausedGauges() external view returns (uint256 numPausedGauges);
-    
+
     /**
      * @notice Get gauge name.
      * @param gaugeID_ The ID of the gauge to query.
@@ -238,7 +238,7 @@ interface IGaugeController {
      * @return votersCount Number of votes.
      */
     function getVotersCount(address votingContract_) external view returns (uint256 votersCount);
-    
+
     /**
      * @notice Get current epoch length in seconds.
      * @return epochLength
@@ -337,7 +337,7 @@ interface IGaugeController {
      * @param tokenholder_ Address of new tokenholder.
      */
     function removeTokenholder(address tokenholder_) external;
-    
+
     /**
      * @notice Set annual rate-on-line for selected gaugeIDs
      * @dev 1e18 => 100%

contracts/interfaces/native/IUnderwritingEquity.sol

@@ -24,15 +24,17 @@ interface IUnderwritingEquity is IERC20Metadata {
     ***************************************/
 
     /// @notice Emitted when a deposit is made.
-    event DepositMade(address user, uint256 uwpAmount, uint256 uweAmount);
+    event DepositMade(address indexed user, uint256 uwpAmount, uint256 uweAmount);
     /// @notice Emitted when a withdraw is made.
-    event WithdrawMade(address user, uint256 uwpAmount, uint256 uweAmount);
+    event WithdrawMade(address indexed user, uint256 uwpAmount, uint256 uweAmount);
     /// @notice Emitted when uwp is loaned.
     event UwpLoaned(uint256 uwpAmount, address receiver);
     /// @notice Emitted when issue fee is set.
     event IssueFeeSet(uint256 fee, address receiver);
     /// @notice Emitted when pause is set.
     event PauseSet(bool depositIsPaused, bool withdrawIsPaused, bool lendIsPaused);
+    /// @notice Emitted when the [`UWP`](./../../native/UnderwritingPool) contract is set.
+    event UwpSet(address uwp);
 
     /***************************************
     VIEW FUNCTIONS
@@ -134,9 +136,17 @@ interface IUnderwritingEquity is IERC20Metadata {
 
     /**
      * @notice Pauses or unpauses contract functionality.
+     * Can only be called by the current [**governor**](/docs/protocol/governance).
      * @param depositIsPaused True to pause deposit, false to unpause.
      * @param withdrawIsPaused True to pause withdraw, false to unpause.
      * @param lendIsPaused True to pause lend, false to unpause.
      */
     function setPause(bool depositIsPaused, bool withdrawIsPaused, bool lendIsPaused) external;
+
+    /**
+     * @notice Upgrades the [`UWP`](./../../native/UnderwritingPool) contract.
+     * Can only be called by the current [**governor**](/docs/protocol/governance).
+     * @param uwp_ The address of the new [`UWP`](./../../native/UnderwritingPool).
+     */
+    function setUwp(address uwp_) external;
 }

contracts/interfaces/native/IUnderwritingLockVoting.sol

@@ -8,26 +8,26 @@ import "./GaugeStructs.sol";
  * @title IUnderwritingLockVoting
  * @author solace.fi
  * @notice Enables individual votes in Solace Native insurance gauges for owners of [`UnderwritingLocker`](./UnderwritingLocker).
- * 
+ *
  * Any address owning an underwriting lock can vote and will have a votePower that can be viewed with [`getVotePower()`](#getVotePower)
  * An address' vote power is the sum of the vote power of its owned locks.
  * A lock's vote power scales linearly with locked amount, and through a sqrt formula with lock duration
  * Users cannot view the vote power of an individual lock through this contract, only the total vote power of an address.
  * This is an intentional design choice to abstract locks away from address-based voting.
- * 
+ *
  * Voters can set a delegate who can vote on their behalf via [`setDelegate()`](#setDelegate).
- * 
+ *
  * To cast a vote, either the voter or their delegate can call [`vote()`](#vote) or [`voteMultiple()`](#voteMultiple).
  * Votes can be cast among existing gaugeIDs (set in GaugeController.sol), and voters/delegates can set a custom proportion
  * of their total voting power for different gauges.
  * Voting power proportion is measured in bps, and total used voting power bps for a voter cannot exceed 10000.
- * 
+ *
  * Votes are saved, so a vote today will count as the voter's vote for all future epochs until the voter modifies their votes.
- * 
+ *
  * After each epoch (one-week) has passed, voting is frozen until governance has processed all the votes.
  * This is a two-step process:
  * GaugeController.updateGaugeWeights() - this will aggregate individual votes and update gauge weights accordingly
- * [`chargePremiums()`](#chargepremiums) - this will charge premiums for every vote. There is a voting premium 
+ * [`chargePremiums()`](#chargepremiums) - this will charge premiums for every vote. There is a voting premium
  * to be paid every epoch, this gets sent to the revenue router.
  */
 interface IUnderwritingLockVoting is IGaugeVoter {
@@ -187,7 +187,7 @@ interface IUnderwritingLockVoting is IGaugeVoter {
 
     /**
      * @notice Register a single vote for a gauge. Can either add or change a vote.
-     * @notice Can also remove a vote (votePowerBPS_ == 0), the difference with removeVote() is that 
+     * @notice Can also remove a vote (votePowerBPS_ == 0), the difference with removeVote() is that
      * vote() will revert if the voter has no locks (no locks => no right to vote, but may have votes from
      * locks that have since been burned).
      * @notice GaugeController.updateGaugeWeights() will remove voters with no voting power, however voters can

contracts/interfaces/native/IUnderwritingLocker.sol

@@ -14,8 +14,8 @@ struct Lock {
  * @author solace.fi
  * @notice Having an underwriting lock is a requirement to vote on Solace Native insurance gauges.
  * To create an underwriting lock, $UWE must be locked for a minimum of 6 months.
- * 
- * Locks are ERC721s and can be viewed with [`locks()`](#locks). 
+ *
+ * Locks are ERC721s and can be viewed with [`locks()`](#locks).
  * Each lock has an `amount` of locked $UWE, and an `end` timestamp.
  * Locks have a maximum duration of four years.
  *

contracts/native/BribeController.sol

@@ -11,7 +11,6 @@ import "./../interfaces/native/IGaugeController.sol";
 import "./../interfaces/utils/IRegistry.sol";
 import "./../utils/EnumerableMapS.sol";
 import "./../utils/Governable.sol";
-import "hardhat/console.sol";
 
 contract BribeController is 
         IBribeController, 

contracts/native/DepositHelper.sol

@@ -28,18 +28,14 @@ contract DepositHelper is IDepositHelper, ReentrancyGuard {
     STATE VARIABLES
     ***************************************/
 
-    address internal _uwp;
     address internal _uwe;
     address internal _locker;
 
-    constructor(address uwp_, address uwe_, address locker_) {
-        require(uwp_ != address(0x0), "zero address uwp");
+    constructor(address uwe_, address locker_) {
         require(uwe_ != address(0x0), "zero address uwe");
         require(locker_ != address(0x0), "zero address locker");
-        _uwp = uwp_;
         _uwe = uwe_;
         _locker = locker_;
-        IERC20(uwp_).approve(uwe_, type(uint256).max);
         IERC20(uwe_).approve(locker_, type(uint256).max);
     }
 
@@ -52,7 +48,7 @@ contract DepositHelper is IDepositHelper, ReentrancyGuard {
      * @return uwp The underwriting pool.
      */
     function underwritingPool() external view override returns (address uwp) {
-        return _uwp;
+        return IUnderwritingEquity(_uwe).underwritingPool();
     }
 
     /**
@@ -79,8 +75,8 @@ contract DepositHelper is IDepositHelper, ReentrancyGuard {
      * @return uweAmount The amount of [`UWE`](./UnderwritingEquity) that will be minted to the receiver.
      */
     function calculateDeposit(address depositToken, uint256 depositAmount) external view override returns (uint256 uweAmount) {
-        address uwp_ = _uwp;
         address uwe_ = _uwe;
+        address uwp_ = IUnderwritingEquity(uwe_).underwritingPool();
         uint256 amount = depositAmount;
         // if deposit token is not uwp nor uwe
         // likely token is member of set
@@ -154,8 +150,8 @@ contract DepositHelper is IDepositHelper, ReentrancyGuard {
         address depositToken,
         uint256 depositAmount
     ) internal returns (uint256 uweAmount) {
-        address uwp_ = _uwp;
         address uwe_ = _uwe;
+        address uwp_ = IUnderwritingEquity(uwe_).underwritingPool();
         uint256 amount = depositAmount;
         IERC20 tkn = IERC20(depositToken);
         // pull tokens from msg.sender
@@ -174,6 +170,8 @@ contract DepositHelper is IDepositHelper, ReentrancyGuard {
         // if deposit token is not uwe
         if(depositToken != uwe_) {
             // deposit uwp into uwe
+            IERC20 uwp2 = IERC20(uwp_);
+            if(uwp2.allowance(address(this), uwe_) < amount) uwp2.approve(uwe_, type(uint256).max);
             amount = IUnderwritingEquity(uwe_).deposit(amount, address(this));
         }
         return amount;

contracts/native/GaugeController.sol

@@ -18,18 +18,18 @@ import "./../interfaces/native/IGaugeController.sol";
  * Current gauge weights can be obtained through [`getGaugeWeight()`](#getgaugeweight) and [`getAllGaugeWeights()`](#getallgaugeweights)
  *
  * Only governance can make mutator calls to GaugeController.sol. There are no unpermissioned external mutator calls in this contract.
- * 
+ *
  * After every epoch, governance must call [`updateGaugeWeights()`](#updategaugeweights). This will process the last epoch's votes (stored in this contract).
- * 
+ *
  * Individual voters register and manage their vote through voting contracts that conform to IGaugeVoting.
  *
  * Governance can [`addGauge()`](#addgauge) or [`pauseGauge()`](#pausegauge).
  */
 // solhint-disable-next-line contract-name-camelcase
-contract GaugeController is 
-        IGaugeController, 
-        ReentrancyGuard, 
-        Governable 
+contract GaugeController is
+        IGaugeController,
+        ReentrancyGuard,
+        Governable
     {
     using EnumerableSet for EnumerableSet.AddressSet;
     using EnumerableMapS for EnumerableMapS.UintToUintMap;
@@ -296,7 +296,7 @@ contract GaugeController is
                 (uint256 gaugeID, uint256 votingPowerBPS) = _votes[votingContract_][voter_].at(i);
                 votes[i] = GaugeStructs.Vote(gaugeID, votingPowerBPS);
             }
-        } 
+        }
     }
 
     /**
@@ -313,7 +313,7 @@ contract GaugeController is
             for (uint256 i = 0; i < votersCount; i++) {
                 voters[i] = _voters[votingContract_].at(i);
             }
-        } 
+        }
     }
 
     /**
@@ -327,7 +327,7 @@ contract GaugeController is
             return 0;
         } else {
             return _votes[votingContract_][voter_].length();
-        } 
+        }
     }
 
     /**
@@ -340,7 +340,7 @@ contract GaugeController is
             return 0;
         } else {
             return _voters[votingContract_].length();
-        } 
+        }
     }
 
     /**
@@ -350,7 +350,7 @@ contract GaugeController is
     function getEpochLength() external view override returns (uint256 epochLength) {
         return _epochLength;
     }
-
+    
     /***************************************
     INTERNAL MUTATOR FUNCTIONS
     ***************************************/
@@ -376,14 +376,14 @@ contract GaugeController is
             return 0;
         // Else if removing vote
         } else if (newVotePowerBPS_ == 0) {
-            uint256 oldVotePowerBPS = _votes[votingContract_][voter_].get(gaugeID_);
+            oldVotePowerBPS = _votes[votingContract_][voter_].get(gaugeID_);
             _votes[votingContract_][voter_].remove(gaugeID_);
             // Check if need to remove voter
             if ( _votes[votingContract_][voter_].length() == 0 ) {_voters[votingContract_].remove(voter_);}
             return oldVotePowerBPS;
         // Else modify vote
         } else {
-            uint256 oldVotePowerBPS = _votes[votingContract_][voter_].get(gaugeID_);
+            oldVotePowerBPS = _votes[votingContract_][voter_].get(gaugeID_);
             _votes[votingContract_][voter_].set(gaugeID_, newVotePowerBPS_);
             return oldVotePowerBPS;
         }
@@ -445,7 +445,7 @@ contract GaugeController is
     function addGauge(string calldata gaugeName_, uint256 rateOnLine_) external override onlyGovernance {
         uint256 gaugeID = ++totalGauges;
         GaugeStructs.Gauge memory newGauge = GaugeStructs.Gauge(true, SafeCastS.toUint248(rateOnLine_), gaugeName_);
-        _gauges.push(newGauge); 
+        _gauges.push(newGauge);
         assert(_gauges.length - 1 == totalGauges); // Uphold invariant, should not be violated. -1 because we already added _gauges[0] in constructor.
         emit GaugeAdded(gaugeID, rateOnLine_, gaugeName_);
     }
@@ -572,7 +572,7 @@ contract GaugeController is
             for(uint256 j = _updateInfo.index2 == type(uint88).max || i != _updateInfo.index1 ? 0 : _updateInfo.index2 ; j < numVoters; j++) {
                 if (gasleft() < 200000) {return _saveUpdateState(i, j, 0);}
                 address voter = _voters[votingContract].at(j);
-                uint256 numVotes = _votes[votingContract][voter].length();      
+                uint256 numVotes = _votes[votingContract][voter].length();
                 uint256 votePower = IGaugeVoter(votingContract).getVotePower(voter); // Expensive computation here. ~150K gas for user with max cap of 10 locks.
                 if (votePower == 0) {
                     _votersToRemove.push(voter);
@@ -602,7 +602,7 @@ contract GaugeController is
                 _votersToRemove.pop();
             }
         }
-        
+
         _adjustVotePowerOfGaugeMapping();
         _clearUpdateInfo();
         lastTimeGaugeWeightsUpdated = epochStartTime;
@@ -625,7 +625,7 @@ contract GaugeController is
             updateInfo := or(updateInfo, shr(176, shl(176, votingContractsIndex_))) // [0:80] => votingContractsIndex_
             updateInfo := or(updateInfo, shr(88, shl(168, votersIndex_))) // [80:168] => votersIndex_
             updateInfo := or(updateInfo, shl(168, votesIndex_)) // [168:256] => votesIndex_
-            sstore(_updateInfo.slot, updateInfo) 
+            sstore(_updateInfo.slot, updateInfo)
         }
         emit IncompleteGaugeUpdate();
     }
@@ -655,4 +655,4 @@ contract GaugeController is
             }
         }
     }
-}
+}

contracts/native/UnderwritingEquity.sol

@@ -247,6 +247,7 @@ contract UnderwritingEquity is IUnderwritingEquity, ERC20Permit, ReentrancyGuard
 
     /**
      * @notice Pauses or unpauses contract functionality.
+     * Can only be called by the current [**governor**](/docs/protocol/governance).
      * @param depositIsPaused True to pause deposit, false to unpause.
      * @param withdrawIsPaused True to pause withdraw, false to unpause.
      * @param lendIsPaused True to pause lend, false to unpause.
@@ -257,4 +258,15 @@ contract UnderwritingEquity is IUnderwritingEquity, ERC20Permit, ReentrancyGuard
         _lendIsPaused = lendIsPaused;
         emit PauseSet(depositIsPaused, withdrawIsPaused, lendIsPaused);
     }
+
+    /**
+     * @notice Upgrades the [`UWP`](./UnderwritingPool) contract.
+     * Can only be called by the current [**governor**](/docs/protocol/governance).
+     * @param uwp_ The address of the new [`UWP`](./UnderwritingPool).
+     */
+    function setUwp(address uwp_) external override onlyGovernance {
+        require(uwp_ != address(0x0), "zero address uwp");
+        _uwp = uwp_;
+        emit UwpSet(uwp_);
+    }
 }