Merge pull request #6 from akropolisio/savings-merge

Merge savings-pool copy

Author: mazaletskiy

contracts/deploy/PoolToken_Compound_DAI.sol

@@ -6,8 +6,8 @@ contract PoolToken_Compound_DAI is PoolToken {
     function initialize(address _pool) public initializer {
         PoolToken.initialize(
             _pool, 
-            "Akropolis Delpi Savings - Compound - DAI",
-            "ADST-COMP-DAI"
+            "Delphi Compound DAI",
+            "dCDAI"
         );
     }    
 }

contracts/deploy/PoolToken_CurveFi_SBTC.sol

@@ -0,0 +1,13 @@
+pragma solidity ^0.5.12;
+
+import "../modules/token/PoolToken.sol";
+
+contract PoolToken_CurveFi_SBTC is PoolToken {
+    function initialize(address _pool) public initializer {
+        PoolToken.initialize(
+            _pool, 
+            "Delphi Curve sBTC",
+            "dsBTC"
+        );
+    }    
+}

contracts/deploy/PoolToken_CurveFi_SUSD.sol

@@ -0,0 +1,13 @@
+pragma solidity ^0.5.12;
+
+import "../modules/token/PoolToken.sol";
+
+contract PoolToken_CurveFi_SUSD is PoolToken {
+    function initialize(address _pool) public initializer {
+        PoolToken.initialize(
+            _pool, 
+            "Delphi Curve sUSD",
+            "dsUSD"
+        );
+    }    
+}

contracts/deploy/PoolToken_CurveFi_Y.sol

@@ -0,0 +1,13 @@
+pragma solidity ^0.5.12;
+
+import "../modules/token/PoolToken.sol";
+
+contract PoolToken_CurveFi_Y is PoolToken {
+    function initialize(address _pool) public initializer {
+        PoolToken.initialize(
+            _pool, 
+            "Delphi Curve yPool",
+            "dyPool"
+        );
+    }    
+}

contracts/interfaces/defi/ICurveFiDeposit.sol

@@ -1,9 +1,6 @@
 pragma solidity ^0.5.12;
 
 contract ICurveFiDeposit { 
-    function add_liquidity (uint256[3] calldata uamounts, uint256 min_mint_amount) external;
-    function remove_liquidity (uint256 _amount, uint256[3] calldata min_uamounts) external;
-    function remove_liquidity_imbalance (uint256[3] calldata uamounts, uint256 max_burn_amount) external;
     function remove_liquidity_one_coin(uint256 _token_amount, int128 i, uint256 min_uamount) external;
     function remove_liquidity_one_coin(uint256 _token_amount, int128 i, uint256 min_uamount, bool donate_dust) external;
     function withdraw_donated_dust() external;

contracts/interfaces/defi/ICurveFiDeposit_SBTC.sol

@@ -0,0 +1,7 @@
+pragma solidity ^0.5.12;
+
+contract ICurveFiDeposit_SBTC { 
+    function add_liquidity (uint256[3] calldata uamounts, uint256 min_mint_amount) external;
+    function remove_liquidity (uint256 _amount, uint256[3] calldata min_uamounts) external;
+    function remove_liquidity_imbalance (uint256[3] calldata uamounts, uint256 max_burn_amount) external;
+}

contracts/interfaces/defi/ICurveFiDeposit_SUSD.sol

@@ -0,0 +1,7 @@
+pragma solidity ^0.5.12;
+
+contract ICurveFiDeposit_SUSD { 
+    function add_liquidity (uint256[4] calldata uamounts, uint256 min_mint_amount) external;
+    function remove_liquidity (uint256 _amount, uint256[4] calldata min_uamounts) external;
+    function remove_liquidity_imbalance (uint256[4] calldata uamounts, uint256 max_burn_amount) external;
+}

contracts/interfaces/defi/ICurveFiDeposit_Y.sol

@@ -0,0 +1,7 @@
+pragma solidity ^0.5.12;
+
+contract ICurveFiDeposit_Y { 
+    function add_liquidity (uint256[4] calldata uamounts, uint256 min_mint_amount) external;
+    function remove_liquidity (uint256 _amount, uint256[4] calldata min_uamounts) external;
+    function remove_liquidity_imbalance (uint256[4] calldata uamounts, uint256 max_burn_amount) external;
+}

contracts/interfaces/defi/ICurveFiRewards.sol

@@ -0,0 +1,9 @@
+pragma solidity ^0.5.16;
+
+interface ICurveFiRewards {
+    function stake(uint256 amount) external;
+    function withdraw(uint256 amount) external;
+    function getReward() external;
+    function earned(address account) external view returns (uint256);
+    function balanceOf(address account) external view returns (uint256);
+}

contracts/interfaces/defi/ICurveFiRewards_SBTC.sol

@@ -0,0 +1,5 @@
+pragma solidity ^0.5.16;
+
+interface ICurveFiRewards_SBTC {
+    function rewardsToken() external view returns (address);
+}