Merge pull request #4 from zeriontech/additional-adapters

Adapters for Compound, PoolTogether, and others
zeriontech · Feb 20, 2020 · bde61ed · bde61ed
2 parents 3f0bdd7 + b802609
commit bde61ed
Show file tree

Hide file tree

Showing 34 changed files with 1,810 additions and 2,004 deletions.
diff --git a/.solcover.js b/.solcover.js
@@ -7,6 +7,7 @@ module.exports = {
     'ERC20.sol',
     'Logic.sol',
     'adapters/Adapter.sol',
+    'adapters/MKRAdapter.sol',
     'interactiveAdapters',
     'mock',
   ],

diff --git a/.solhint.json b/.solhint.json
@@ -10,7 +10,7 @@
     ],
     "compiler-version": [
       "error",
-      "0.6.1"
+      "0.6.2"
     ]
   }
 }
diff --git a/README.md b/README.md
@@ -11,9 +11,15 @@ This is a project with Zerion Smart Contracts interacting with different DeFi pr
   - [AdapterRegistry](#adapterregistry-is-AdapterAssetsManager)
   - [AdapterAssetsManager](#AdapterAssetsManager-is-ownable)
   - [Ownable](#ownable)
+  - [adapters/AaveAdapter](#aaveadapter-is-Adapter)
+  - [adapters/CompoundAdapter](#compoundadapter-is-Adapter)
+  - [adapters/CurveAdapter](#curveadapter-is-Adapter)
   - [adapters/DSRAdapter](#dsradapter-is-Adapter)
+  - [adapters/MCDAdapter](#mcdadapter-is-Adapter)
+  - [adapters/MKRAdapter (abstract contract)](#mkradapter-abstract-contract)
+  - [adapters/PoolTogetherAdapter](#pooltogetheradapter-is-Adapter)
   - [adapters/SynthetixAdapter](#synthetixadapter-is-Adapter)
-  - [adapters/CurveAdapter](#curveadapter-is-Adapter)
+  - [adapters/ZrxAdapter](#zrxadapter-is-Adapter)
   - [adapters/Adapter (abstract contract)](#Adapter-abstract-contract)
   - [Logic](#logic)
   - [TokenSpender](#tokenspender)
@@ -96,11 +102,35 @@ Base contract for `AdapterAssetsManager` and `Logic` contracts.
 Implements `Ownable` logic.
 Includes `onlyOwner` modifier, `transferOwnership()` function, and public state variable `owner`. 
 
+## AaveAdapter is [Adapter](#Adapter-abstract-contract)
+
+Adapter for Aave protocol.
+
+## CompoundAdapter is [Adapter](#Adapter-abstract-contract)
+
+Adapter for Compound protocol.
+
+## CurveAdapter is [Adapter](#Adapter-abstract-contract)
+
+Adapter for [curve.fi](https://compound.curve.fi/) protocol.
+Currently, there is the only pool with cDAI/cUSDC locked on it.
+
 ## DSRAdapter is [Adapter](#Adapter-abstract-contract)
 
 Adapter for DSR protocol.
 
-Interactive adapter will not be implemented.
+## MCDAdapter is [Adapter](#Adapter-abstract-contract)
+
+Adapter for MCD vaults.
+
+## MKRAdapter (abstract contract)
+
+Base contract for Maker adapters.
+It includes all the required constants and `pure` functions with calculations.
+
+## PoolTogetherAdapter is [Adapter](#Adapter-abstract-contract)
+
+Adapter for PoolTogether protocol.
 
 ## SynthetixAdapter is [Adapter](#Adapter-abstract-contract)
 
@@ -110,12 +140,9 @@ Adapter for Synthetix protocol.
 - amount of SNX tokens locked by minting sUSD tokens (positive);
 - amount of sUSD that should be burned to unlock SNX tokens (negative).
 
-Interactive adapter will not be implemented.
-
-## CurveAdapter is [Adapter](#Adapter-abstract-contract)
+## ZrxAdapter is [Adapter](#Adapter-abstract-contract)
 
-Adapter for [curve.fi](https://compound.curve.fi/) protocol.
-Currently, there is the only pool with cDAI/cUSDC locked on it.
+Adapter for Zrx protocol.
 
 ## Adapter (abstract contract)
 

diff --git a/contracts/AdapterAssetsManager.sol b/contracts/AdapterAssetsManager.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.6.1;
+pragma solidity 0.6.2;
 pragma experimental ABIEncoderV2;
 
 import { Ownable } from "./Ownable.sol";

diff --git a/contracts/AdapterRegistry.sol b/contracts/AdapterRegistry.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.6.1;
+pragma solidity 0.6.2;
 pragma experimental ABIEncoderV2;
 
 import { Adapter } from "./adapters/Adapter.sol";
@@ -15,11 +15,13 @@ import {
 
 /**
 * @title Registry for protocol adapters.
-* @notice balance() and exchangeRates() functions
+* @notice getBalances() and getRates() functions
 * with different arguments implement the main functionality.
 */
 contract AdapterRegistry is AdapterAssetsManager {
 
+    address internal constant ETH = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;
+
     constructor(
         address[] memory _adapters,
         address[][] memory _assets
@@ -42,7 +44,7 @@ contract AdapterRegistry is AdapterAssetsManager {
         address[] memory adapters = getAdapters();
         ProtocolDetail[] memory protocolDetails = new ProtocolDetail[](adapters.length);
 
-        for (uint i = 0; i < adapters.length; i++) {
+        for (uint256 i = 0; i < adapters.length; i++) {
             protocolDetails[i] = ProtocolDetail({
                 name: Adapter(adapters[i]).getProtocolName(),
                 balances: getBalances(user, adapters[i]),
@@ -67,7 +69,7 @@ contract AdapterRegistry is AdapterAssetsManager {
         address[] memory adapters = getAdapters();
         ProtocolBalance[] memory protocolBalances = new ProtocolBalance[](adapters.length);
 
-        for (uint i = 0; i < adapters.length; i++) {
+        for (uint256 i = 0; i < adapters.length; i++) {
             protocolBalances[i] = ProtocolBalance({
                 name: Adapter(adapters[i]).getProtocolName(),
                 balances: getBalances(user, adapters[i])
@@ -89,7 +91,7 @@ contract AdapterRegistry is AdapterAssetsManager {
         address[] memory adapters = getAdapters();
         ProtocolRate[] memory protocolRates = new ProtocolRate[](adapters.length);
 
-        for (uint i = 0; i < adapters.length; i++) {
+        for (uint256 i = 0; i < adapters.length; i++) {
             protocolRates[i] = ProtocolRate({
                 name: Adapter(adapters[i]).getProtocolName(),
                 rates: getRates(adapters[i])
@@ -137,7 +139,7 @@ contract AdapterRegistry is AdapterAssetsManager {
             assetBalances[i] = AssetBalance({
                 asset: asset,
                 amount: Adapter(adapter).getAssetAmount(asset, user),
-                decimals: ERC20(asset).decimals()
+                decimals: getAssetDecimals(asset)
             });
         }
 
@@ -185,4 +187,15 @@ contract AdapterRegistry is AdapterAssetsManager {
 
         return rates;
     }
+
+    function getAssetDecimals(
+        address asset
+    )
+        internal
+        view
+        returns (uint8)
+    {
+        return asset == ETH ? uint8(18) : ERC20(asset).decimals();
+    }
+
 }
diff --git a/contracts/ERC20.sol b/contracts/ERC20.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.6.1;
+pragma solidity 0.6.2;
 pragma experimental ABIEncoderV2;
 
 

diff --git a/contracts/Ownable.sol b/contracts/Ownable.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.6.1;
+pragma solidity 0.6.2;
 pragma experimental ABIEncoderV2;
 
 

diff --git a/contracts/Structs.sol b/contracts/Structs.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.6.1;
+pragma solidity 0.6.2;
 pragma experimental ABIEncoderV2;
 
 
@@ -23,7 +23,7 @@ struct ProtocolRate {
 
 struct AssetBalance {
     address asset;
-    int128 amount;
+    int256 amount;
     uint8 decimals;
 }
 

diff --git a/contracts/adapters/AaveAdapter.sol b/contracts/adapters/AaveAdapter.sol
@@ -0,0 +1,87 @@
+pragma solidity 0.6.2;
+pragma experimental ABIEncoderV2;
+
+import { Adapter } from "./Adapter.sol";
+import { Component } from "../Structs.sol";
+
+
+/**
+ * @dev LendingPoolAddressesProvider contract interface.
+ * Only the functions required for AaveAdapter contract are added.
+ * The LendingPoolAddressesProvider contract is available here
+ * https://github.com/aave/aave-protocol/blob/master/contracts/configuration/LendingPoolAddressesProvider.sol.
+ */
+interface LendingPoolAddressesProvider {
+    function getLendingPool() external view returns (LendingPool);
+}
+
+
+/**
+ * @dev LendingPool contract interface.
+ * Only the functions required for AaveAdapter contract are added.
+ * The LendingPool contract is available here
+ * https://github.com/aave/aave-protocol/blob/master/contracts/lendingpool/LendingPool.sol.
+ */
+interface LendingPool {
+    function getUserReserveData(address, address)
+        external
+        view
+        returns (
+            uint256,
+            uint256,
+            uint256,
+            uint256,
+            uint256,
+            uint256,
+            uint256,
+            uint256,
+            uint256,
+            bool
+        );
+}
+
+
+/**
+ * @title Adapter for Aave protocol.
+ * @dev Implementation of Adapter interface.
+ */
+contract AaveAdapter is Adapter {
+
+    address internal constant PROVIDER = 0x24a42fD28C976A61Df5D00D0599C34c4f90748c8;
+
+    /**
+     * @return Name of the protocol.
+     * @dev Implementation of Adapter function.
+     */
+    function getProtocolName() external pure override returns (string memory) {
+        return("Aave");
+    }
+
+    /**
+     * @return Amount of asset locked on the protocol by the given user.
+     * @dev Implementation of Adapter function.
+     */
+    function getAssetAmount(address asset, address user) external view override returns (int256) {
+        LendingPool pool = LendingPoolAddressesProvider(PROVIDER).getLendingPool();
+
+        (uint256 depositAmount, uint256 debtAmount, , , , , , , , ) =
+            pool.getUserReserveData(asset, user);
+
+        return depositAmount > 0 ? int256(depositAmount) : -int256(debtAmount);
+    }
+
+    /**
+     * @return Struct with underlying assets rates for the given asset.
+     * @dev Implementation of Adapter function.
+     */
+    function getUnderlyingRates(address asset) external view override returns (Component[] memory) {
+        Component[] memory components = new Component[](1);
+
+        components[0] = Component({
+            underlying: asset,
+            rate: uint256(1e18)
+        });
+
+        return components;
+    }
+}
diff --git a/contracts/adapters/Adapter.sol b/contracts/adapters/Adapter.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.6.1;
+pragma solidity 0.6.2;
 pragma experimental ABIEncoderV2;
 
 import { Component } from "../Structs.sol";
@@ -8,20 +8,20 @@ import { Component } from "../Structs.sol";
  * @title Base contract for protocol adapters.
  * @dev getProtocolName(), getAssetAmount(), and getUnderlyingRates() functions MUST be implemented.
  */
-abstract contract Adapter {
+interface Adapter {
 
     /**
      * @dev MUST return name of the protocol.
      */
-    function getProtocolName() external pure virtual returns (string memory);
+    function getProtocolName() external pure returns (string memory);
 
     /**
      * @dev MUST return amount of the given asset locked on the protocol by the given user.
      */
-    function getAssetAmount(address asset, address user) external view virtual returns (int128);
+    function getAssetAmount(address asset, address user) external view returns (int256);
 
     /**
      * @dev MUST return struct with underlying assets rates for the given asset.
      */
-    function getUnderlyingRates(address asset) external view virtual returns (Component[] memory);
+    function getUnderlyingRates(address asset) external view returns (Component[] memory);
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ @@
         ],
         "compiler-version": [
           "error",
-          "0.6.1"
+          "0.6.2"
         ]
       }
     }