merge

.eslintrc.json

@@ -0,0 +1,22 @@
+{
+  "env": {
+    "browser": true,
+    "es6": true
+  },
+  "extends": [
+    "airbnb-base"
+  ],
+  "globals": {
+    "Atomics": "readonly",
+    "SharedArrayBuffer": "readonly"
+  },
+  "parserOptions": {
+    "ecmaVersion": 2018,
+    "sourceType": "module"
+  },
+  "rules": {
+    "indent": ["error", 2],
+    "no-undef": "off",
+    "prefer-const": "off"
+  }
+}

.github/workflows/build.yml

@@ -8,11 +8,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
       - name: setup-node
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
-          node-version: '10.x'
+          node-version: '14'
       - name: install
         run: npm install
       - name: build

.github/workflows/coverage.yml

@@ -8,11 +8,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
       - name: setup-node
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
-          node-version: '10.x'
+          node-version: '14'
       - name: install
         run: npm install
       - name: test+coverage

.github/workflows/lint.yml

@@ -8,11 +8,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
       - name: setup-node
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
-          node-version: '10.x'
+          node-version: '14'
       - name: install
         run: npm install
       - name: lint

.github/workflows/test.yml

@@ -8,11 +8,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
       - name: setup-node
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
-          node-version: '10.x'
+          node-version: '14'
       - name: install
         run: npm install
       - name: test

.gitignore

@@ -9,3 +9,4 @@ coverage.json
 .log
 .env
 ganache.log
+.DS_Store

.solhint.json

@@ -9,7 +9,8 @@
       { "maxLength" : 50 }
     ],
     "function-max-lines": [
-      "error", 60
+      "error",
+      149
     ],
     "compiler-version": [
       "error",
@@ -20,6 +21,9 @@
     ],
     "const-name-snakecase": [
       "off"
+    ],
+    "comprehensive-interface": [
+      "off"
     ]
   }
 }

.solhintignore

@@ -9,3 +9,4 @@ node_modules
 ./contracts/ProtocolManager.sol
 ./contracts/TokenAdapterManager.sol
 ./contracts/adapters/dydx
+./contracts/adapters/berezka/lib

compiler.json

@@ -0,0 +1,14 @@
+{
+  "contractsDir": "contracts",
+  "artifactsDir": "artifacts",
+  "contracts": [],
+  "shouldSaveStandardInput": true,
+  "compilerSettings": {
+    "optimizer": { "enabled": true, "runs": 1000000 },
+    "outputSelection": {
+      "*": {
+        "*": ["abi", "evm.bytecode.object"]
+      }
+    }
+  }
+}

contracts/ProtocolManager.sol

@@ -33,13 +33,13 @@ abstract contract ProtocolManager is Ownable {
     string internal constant INITIAL_PROTOCOL_NAME = "Initial protocol name";
 
     // protocol name => next protocol name (linked list)
-    mapping (string => string) internal nextProtocolName;
+    mapping(string => string) internal nextProtocolName;
     // protocol name => protocol struct with info and adapters
-    mapping (string => ProtocolMetadata) internal protocolMetadata;
+    mapping(string => ProtocolMetadata) internal protocolMetadata;
     // protocol name => array of protocol adapters
-    mapping (string => address[]) internal protocolAdapters;
+    mapping(string => address[]) internal protocolAdapters;
     // protocol adapter => array of supported tokens
-    mapping (address => address[]) internal supportedTokens;
+    mapping(address => address[]) internal supportedTokens;
 
     /**
      * @notice Initializes contract storage.

contracts/TokenAdapterManager.sol

@@ -32,9 +32,9 @@ abstract contract TokenAdapterManager is Ownable {
     string internal constant INITIAL_NAME = "Initial token name";
 
     // adapter name => next adapter name (linked list)
-    mapping (string => string) internal nextTokenAdapterName;
+    mapping(string => string) internal nextTokenAdapterName;
     // adapter name => adapter info
-    mapping (string => address) internal tokenAdapter;
+    mapping(string => address) internal tokenAdapter;
 
     /**
      * @notice Initializes contract storage.

contracts/adapters/ERC20TokenAdapter.sol

@@ -116,7 +116,7 @@ contract ERC20TokenAdapter is TokenAdapter {
         bytes memory result;
 
         for (uint256 i = 0; i < 32; i++) {
-            if (data[i] != byte(0)) {
+            if (data[i] != bytes1(0)) {
                 length++;
             }
         }

contracts/adapters/TokenAdapter.sol

@@ -38,12 +38,12 @@ interface TokenAdapter {
     function getMetadata(address token) external view returns (TokenMetadata memory);
 
     /**
-    * @dev MUST return array of Component structs with underlying tokens rates for the given token.
-    * struct Component {
-    *     address token;    // Address of token contract
-    *     string tokenType; // Token type ("ERC20" by default)
-    *     uint256 rate;     // Price per share (1e18)
-    * }
-    */
+     * @dev MUST return array of Component structs with underlying tokens rates for the given token.
+     * struct Component {
+     *     address token;    // Address of token contract
+     *     string tokenType; // Token type ("ERC20" by default)
+     *     uint256 rate;     // Price per share (1e18)
+     * }
+     */
     function getComponents(address token) external view returns (Component[] memory);
 }

contracts/adapters/aave/AaveStakingAdapter.sol

@@ -0,0 +1,53 @@
+// Copyright (C) 2020 Zerion Inc. <https://zerion.io>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+pragma solidity 0.6.5;
+pragma experimental ABIEncoderV2;
+
+import { ERC20 } from "../../ERC20.sol";
+import { ProtocolAdapter } from "../ProtocolAdapter.sol";
+
+
+interface StakedAave {
+    function getTotalRewardsBalance(address) external view returns (uint256);
+}
+
+
+/**
+ * @title Adapter for Aave protocol (staking).
+ * @dev Implementation of ProtocolAdapter interface.
+ * @author Igor Sobolev <[email protected]>
+ */
+contract AaveStakingAdapter is ProtocolAdapter {
+
+    string public constant override adapterType = "Asset";
+
+    string public constant override tokenType = "ERC20";
+
+    address internal constant STAKED_AAVE = 0x4da27a545c0c5B758a6BA100e3a049001de870f5;
+
+    /**
+     * @return Amount of staked AAVE tokens for a given account.
+     * @dev Implementation of ProtocolAdapter interface function.
+     */
+    function getBalance(address, address account) external view override returns (uint256) {
+        uint256 totalBalance = 0;
+
+        totalBalance += ERC20(STAKED_AAVE).balanceOf(account);
+        totalBalance += StakedAave(STAKED_AAVE).getTotalRewardsBalance(account);
+
+        return totalBalance;
+    }
+}

contracts/adapters/aaveUniswap/AaveUniswapAssetAdapter.sol

@@ -0,0 +1,41 @@
+// Copyright (C) 2020 Zerion Inc. <https://zerion.io>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+pragma solidity 0.6.5;
+pragma experimental ABIEncoderV2;
+
+import { ERC20 } from "../../ERC20.sol";
+import { ProtocolAdapter } from "../ProtocolAdapter.sol";
+
+
+/**
+ * @title Asset adapter for Aave protocol (Uniswap market).
+ * @dev Implementation of ProtocolAdapter interface.
+ * @author Igor Sobolev <[email protected]>
+ */
+contract AaveUniswapAssetAdapter is ProtocolAdapter {
+
+    string public constant override adapterType = "Asset";
+
+    string public constant override tokenType = "AToken Uniswap Market";
+
+    /**
+     * @return Amount of ATokens held by the given account.
+     * @dev Implementation of ProtocolAdapter interface function.
+     */
+    function getBalance(address token, address account) external view override returns (uint256) {
+        return ERC20(token).balanceOf(account);
+    }
+}

contracts/adapters/aaveUniswap/AaveUniswapDebtAdapter.sol

@@ -0,0 +1,68 @@
+// Copyright (C) 2020 Zerion Inc. <https://zerion.io>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+pragma solidity 0.6.5;
+pragma experimental ABIEncoderV2;
+
+import { ProtocolAdapter } from "../ProtocolAdapter.sol";
+
+
+/**
+ * @dev LendingPoolAddressesProvider contract interface.
+ * Only the functions required for AaveUniswapDebtAdapter contract are added.
+ * The LendingPoolAddressesProvider contract is available here
+ * 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 AaveUniswapDebtAdapter contract are added.
+ * The LendingPool contract is available here
+ * github.com/aave/aave-protocol/blob/master/contracts/lendingpool/LendingPool.sol.
+ */
+interface LendingPool {
+    function getUserReserveData(address, address) external view returns (uint256, uint256);
+}
+
+
+/**
+ * @title Debt adapter for Aave protocol (Uniswap market).
+ * @dev Implementation of ProtocolAdapter interface.
+ * @author Igor Sobolev <[email protected]>
+ */
+contract AaveUniswapDebtAdapter is ProtocolAdapter {
+
+    address internal constant PROVIDER = 0x7fd53085B9A29D236235D6FC593b47C9C33429F1;
+
+    string public constant override adapterType = "Debt";
+
+    string public constant override tokenType = "ERC20";
+
+    /**
+     * @return Amount of debt of the given account for the protocol.
+     * @dev Implementation of ProtocolAdapter interface function.
+     */
+    function getBalance(address token, address account) external view override returns (uint256) {
+        LendingPool pool = LendingPoolAddressesProvider(PROVIDER).getLendingPool();
+
+        (, uint256 debtAmount) = pool.getUserReserveData(token, account);
+
+        return debtAmount;
+    }
+}