PerpV2 Basis Trading Module (#198)

* Add initial implementation

* Add WIP unit tests; Fix bugs

* Add javadocs; Fix bugs

* Fix protocol fees & tradeAndTrackFunding

* Fix failing tests; Add test for moduleRedeemHook; Speed up tests

* Add tests for getRedemptionAdjustments

* Add suggested changes

* Remove .only from tests

* Fix: protocol and manager fee split

* Fix withdrawFundingAndAccrueFees; Add comments

* Add comments

* Make overrides and super calls clearer; Add modifiers as required

* Add comment explaining require statement in updatePerformanceFee

* Updated version to 0.1.12-basis.0

* Remove _trackSettledFunding from withdrawAndAccrueFees

* Dry withdrawFunding function; Fix typos

* Fix getRedemptionAdjustment tests

Author: Sachin

contracts/lib/UnitConversionUtils.sol

@@ -58,13 +58,24 @@ library UnitConversionUtils {
     }
 
     /**
-     * @dev Converts an arbitrarily decimalized quantity into a PRECISE_UNIT quantity.
+     * @dev Converts an arbitrarily decimalized quantity into a int256 PRECISE_UNIT quantity.
      *
      * @param _amount       Non-PRECISE_UNIT amount to convert
      * @param _decimals     Decimal precision of amount being converted to PRECISE_UNIT
-     * @return              Input converted to PRECISE_UNIT decimal format
+     * @return              Input converted to int256 PRECISE_UNIT decimal format
      */
     function toPreciseUnitsFromDecimals(int256 _amount, uint8 _decimals) internal pure returns (int256) {
         return _amount.mul(int256(10**(18 - (uint(_decimals)))));
     }
+
+    /**
+     * @dev Converts an arbitrarily decimalized quantity into a uint256 PRECISE_UNIT quantity.
+     *
+     * @param _amount       Non-PRECISE_UNIT amount to convert
+     * @param _decimals     Decimal precision of amount being converted to PRECISE_UNIT
+     * @return              Input converted to uint256 PRECISE_UNIT decimal format
+     */
+    function toPreciseUnitsFromDecimals(uint256 _amount, uint8 _decimals) internal pure returns (uint256) {
+        return _amount.mul(10**(18 - (uint(_decimals))));
+    }
 }

contracts/protocol/modules/PerpV2BasisTradingModule.sol

@@ -238,7 +238,7 @@ contract PerpV2LeverageModule is ModuleBase, ReentrancyGuard, Ownable, SetTokenA
     function initialize(
         ISetToken _setToken
     )
-        external
+        public
         onlySetManager(_setToken, msg.sender)
         onlyValidAndPendingSet(_setToken)
         onlyAllowedSet(_setToken)
@@ -319,10 +319,10 @@ contract PerpV2LeverageModule is ModuleBase, ReentrancyGuard, Ownable, SetTokenA
         int256 _baseQuantityUnits,
         uint256 _quoteBoundQuantityUnits
     )
-        external
+        public
         nonReentrant
         onlyManagerAndValidSet(_setToken)
-    {
+    {        
         ActionInfo memory actionInfo = _createAndValidateActionInfo(
             _setToken,
             _baseToken,
@@ -403,7 +403,7 @@ contract PerpV2LeverageModule is ModuleBase, ReentrancyGuard, Ownable, SetTokenA
      *
      * NOTE: Function will revert if there is greater than a position unit amount of USDC of account value.
      */
-    function removeModule() external override onlyValidAndInitializedSet(ISetToken(msg.sender)) {
+    function removeModule() public virtual override onlyValidAndInitializedSet(ISetToken(msg.sender)) {
         ISetToken setToken = ISetToken(msg.sender);
 
         // Check that there is less than 1 position unit of USDC of account value (to tolerate PRECISE_UNIT math rounding errors).
@@ -456,7 +456,8 @@ contract PerpV2LeverageModule is ModuleBase, ReentrancyGuard, Ownable, SetTokenA
         ISetToken _setToken,
         uint256 _setTokenQuantity
     )
-        external
+        public
+        virtual
         override
         onlyModule(_setToken)
     {
@@ -488,6 +489,7 @@ contract PerpV2LeverageModule is ModuleBase, ReentrancyGuard, Ownable, SetTokenA
         uint256 _setTokenQuantity
     )
         external
+        virtual
         override
         onlyModule(_setToken)
     {
@@ -618,6 +620,7 @@ contract PerpV2LeverageModule is ModuleBase, ReentrancyGuard, Ownable, SetTokenA
         uint256 _setTokenQuantity
     )
         external
+        virtual
         override
         returns (int256[] memory, int256[] memory _)
     {

contracts/protocol/modules/PerpV2LeverageModule.sol

@@ -1,6 +1,6 @@
 {
   "name": "@setprotocol/set-protocol-v2",
-  "version": "0.1.12",
+  "version": "0.1.12-basis.0",
   "description": "",
   "main": "dist",
   "types": "dist/types",