Commit Graph

216 Commits

Author SHA1 Message Date
Lecky Lao
7439c0ea4a remove virtual on getStakingData as no need anymore 2020-07-19 21:27:42 +10:00
Lecky Lao
a0edb31ab6 marking getStakingData to public;
rename contract name to staking;
2020-07-19 21:21:48 +10:00
Samyak Jain
3b6d453b3d name changes 2020-07-19 20:43:58 +10:00
Lecky Lao
359b6adf36 fixing library import error;
passing test by removing the getSnxAddr in mockSynthetix;
2020-07-19 20:11:37 +10:00
Lecky Lao
193b57b05c uses stakingToken instead of snxToken 2020-07-19 20:06:58 +10:00
Thrilok Kumar
5d2bababe8 Added curve-y connector 2020-07-19 08:59:19 +05:30
Thrilok Kumar
80eeaa5070 Deployed InstaPool connector 2020-07-18 01:44:34 +05:30
Thrilok Kumar
c7e0bcf99a Code Refactoring 2020-07-18 00:56:34 +05:30
Samyak Jain
a12b7ec607 function name change 2020-07-18 04:01:03 +10:00
Samyak Jain
1c5472c0c7 bug resolved 2020-07-18 02:36:21 +10:00
Samyak Jain
e61630b0f8 code structure 2020-07-18 02:33:34 +10:00
Samyak Jain
fefbeba589 updated the setFeeAmount bug 2020-07-18 02:29:38 +10:00
Samyak Jain
c5078d6a71 removed unnecessary function & setFeeAmount edit 2020-07-18 02:21:47 +10:00
Thrilok Kumar
653df9a0d7 Minor refactoring 2020-07-17 21:33:26 +05:30
Thrilok Kumar
51fe81f38a Fixed minor bug 2020-07-17 21:32:19 +05:30
Thrilok Kumar
d7423573ec Minor change 2020-07-17 21:31:24 +05:30
Thrilok Kumar
ce353a60d8 Moved Instapool fee contract to mapping folder 2020-07-17 21:30:34 +05:30
Thrilok Kumar
458eb75631 Major code refactoring 2020-07-17 21:20:25 +05:30
Thrilok Kumar
ae4da2e50d Changed internal variable to public variable 2020-07-17 20:33:57 +05:30
Thrilok Kumar
164d7418bf Added setFeeAmt function 2020-07-17 20:33:16 +05:30
Thrilok Kumar
4d74845e93 Added minor comment 2020-07-17 20:05:47 +05:30
Thrilok Kumar
b43db8f5a7 Code refactoring 2020-07-17 19:56:31 +05:30
Thrilok Kumar
2c26d733c7 Added variable fee collector address 2020-07-17 19:56:06 +05:30
Thrilok Kumar
d22662aadb Fixed typo 2020-07-17 19:23:49 +05:30
Thrilok Kumar
942bf63271 Set fee collector to master address 2020-07-17 19:23:05 +05:30
Thrilok Kumar
ee73084c01 Almost done with instapool fee connector 2020-07-17 19:19:44 +05:30
Thrilok Kumar
a333e2de7c Updated mapping address 2020-07-17 18:03:47 +05:30
Thrilok kumar
3c1ab740c9
Merge pull request #7 from InstaDApp/synthetix-connector
Synthetix connector
2020-07-14 23:34:00 +05:30
Thrilok Kumar
c05d2b1ada snx code refactoring 2020-07-14 23:04:52 +05:30
Lecky Lao
9ce77c1336 update getMappingAddr with virtual;
Update MockSynthetix to override getMappingAddr;
Update test case for adding and removing pool on mapping;
2020-07-15 00:53:21 +10:00
Lecky Lao
df61aebc58 WIP having InternalCompilerError;
formating synthetic.sol and staking.sol;
Adding MockInstaMapping;
update test;
2020-07-14 16:37:08 +10:00
Thrilok kumar
7f5e85df93
Update synthetix.sol 2020-07-13 21:01:59 +05:30
Thrilok kumar
d1265d1cb8
Merge pull request #9 from InstaDApp/COMP-Connector
Added Comp connector
2020-07-12 20:20:46 +05:30
Thrilok Kumar
83482abf97 Updated COMP connector 2020-07-12 17:39:54 +05:30
Lecky Lao
ce11ae6b87 removed constructor from synthetix connector;
overwriting getSynthetixStakingAddr in mock;
comment out everything in migration;
2020-07-12 03:42:59 +10:00
Lecky Lao
becd0135aa formating stores.sol;
fixing import for SafeERC20 and IERC20;
set up constructor for synthetix connector to set address for staking contract;
created MockSynthetix.sol for test;
added nomiclabs/buidler;
fixed test for SynthetixProtocol.js;
adding .gitatributes to highlight solidity on GitHub;
adding buidler artefacts and cache to git ignore;
adding buidler.config.js;
2020-07-12 02:04:48 +10:00
Thrilok kumar
d851c814f3
Merge pull request #8 from InstaDApp/uniswap-integration
Added Uniswap connector
2020-07-09 22:52:10 +05:30
Lecky Lao
cdb8bf01eb created Mocks and MockSynthetix;
adding constructor for MockSynthetix and passing mock for synthetix address;
2020-07-10 01:08:08 +10:00
Thrilok Kumar
3d4c23a998 Added claimReward function 2020-07-09 16:51:39 +05:30
Thrilok Kumar
96ed4f62dd Fixed typo 2020-07-08 22:44:51 +05:30
Thrilok Kumar
e9d74b2ba1 Fixed bug 2020-07-08 15:41:00 +05:30
Thrilok Kumar
acf0654525 Added setId in deposit function 2020-07-07 21:14:33 +05:30
Thrilok Kumar
54c7429106 Added comments 2020-07-07 20:40:27 +05:30
Thrilok Kumar
abeb50aedb made every public function as payable function 2020-07-07 20:37:31 +05:30
Thrilok Kumar
7f5c9b5071 Code refactoring 2020-07-07 20:35:19 +05:30
Lecky Lao
785a91b758 adding withdraw and getReward; 2020-07-08 00:43:14 +10:00
Lecky Lao
c22ffbf20d fixing interface to use external;
fixing address format and document params;
2020-07-07 23:41:52 +10:00
Lecky Lao
1fde0d19d5 adding comment for stakeToken 2020-07-07 23:12:25 +10:00
Lecky Lao
78be404a70 Adding synthetix staking rewards protocol; 2020-07-07 23:06:29 +10:00
Lecky Lao
3138fad284
Merge pull request #6 from InstaDApp/curvesbtc-connector
Curvesbtc connector
2020-07-07 21:44:47 +10:00
Lecky Lao
18a3afd61b removing import that not being used 2020-07-07 21:30:04 +10:00
Thrilok Kumar
220e394caf Done with COMP connector 2020-07-07 14:43:08 +05:30
Thrilok Kumar
48b7703c59 Minor changes 2020-07-06 16:22:56 +05:30
Thrilok Kumar
668d0457b1 Fixed stack too deep error 2020-07-06 16:18:22 +05:30
Thrilok Kumar
3d6d1e21e2 Fixed stack too deep error 2020-07-06 15:31:37 +05:30
Thrilok Kumar
489fc8b69a Fixed minor bugs 2020-07-06 15:29:35 +05:30
Lecky Lao
1c51ff67e6 change ERC20 to use Tokeninterface to save connector size; 2020-07-05 00:55:16 +10:00
Thrilok Kumar
3c8e35b676 Removed constructor from curvebtc connector 2020-07-04 18:51:15 +05:30
Thrilok Kumar
cbc7a2e782 Updated uniswap router address 2020-07-04 03:28:16 +05:30
Thrilok Kumar
4f4e38b3f7 Fixed deadline 2020-07-04 03:27:01 +05:30
Samyak Jain
51403c4775 fixed bug on sell 2020-07-04 01:53:12 +10:00
Samyak Jain
7c9faf98df minor change 2020-07-04 01:34:58 +10:00
Samyak Jain
ea7037e2dd name change uniswap connector 2020-07-04 01:05:48 +10:00
Lecky Lao
7f896a12de change connectorID method in stores to virtual view;
adding connectorID method in connector as override and set model, id in constructor;
modify migration to deploy and set model, id;
update ganache to unlock master;
fixing curveProtocol test to use master address and get dai from uniswap;
fixing curveSBTCProtocol test to use cast for the sell connector method;
2020-07-04 00:43:19 +10:00
Thrilok kumar
ac704ab15b Updated pool connector id 2020-07-03 01:42:49 +05:30
Thrilok Kumar
c639cdc6a9 Done with curve btc connector 2020-07-02 10:27:01 +05:30
Lecky Lao
962d31bce6 Merge branch 'master' into curvesbtc-connector 2020-07-01 21:09:53 +10:00
Thrilok Kumar
e0f5ca3111 Updated makerdao connector Id 2020-07-01 06:32:31 +05:30
Thrilok Kumar
f34a0240d6 Merge branch 'master' of github.com:InstaDApp/dsa-connectors 2020-07-01 06:09:09 +05:30
Thrilok Kumar
26f2de4025 Added Exit dai function 2020-07-01 06:08:54 +05:30
Samyak Jain
5eff9d5e02 updated pool connector 2020-07-01 02:45:12 +10:00
Lecky Lao
a24ee929fd added method withdraw and test; 2020-07-01 00:17:20 +10:00
Lecky Lao
0ff06b28f1 added deposit method and test; 2020-07-01 00:07:15 +10:00
Samyak Jain
085c58dabb maker connector payback debt issue 2020-06-30 23:53:51 +10:00
Lecky Lao
e5f418157f Updated math.sol to use SafeMath from OZ;
update migration to deploy CurveSBTCProtocol;
Added Curvesbtc.sol sell method and got it compiled;
2020-06-30 02:15:35 +10:00
Lecky Lao
bce54aba13 fix formating on connectors/curve.sol;
adding @openzeppelin/test-helpers, ganache-cli;
fixing test/CurveProtocol.js to pass;
added truffle network for tenderly proxy;
added .nvmrc to set to node v12 as ganache-cli requires;
2020-06-28 23:15:51 +10:00
Thrilok Kumar
076a836c03 Added vault transfer function 2020-06-21 01:26:42 +05:30
Thrilok Kumar
e87a70e4db Minor typo 2020-06-21 01:22:12 +05:30
Thrilok Kumar
a30934566d Merge branch 'master' of github.com:InstaDApp/dsa-connectors 2020-06-21 00:34:03 +05:30
Thrilok Kumar
aa384bc856 Updated Connector ID 2020-06-21 00:33:59 +05:30
Samyak Jain
47b096e7ef edited small thing on COMP contract. 2020-06-20 18:01:45 +10:00
Thrilok Kumar
1031c34937 Added claim COMP function 2020-06-20 02:54:36 +05:30
Thrilok Kumar
23df17066d Changed curve connector name 2020-06-19 18:48:32 +05:30
Thrilok Kumar
237d8d857e Fixed typo 2020-06-19 18:46:26 +05:30
Thrilok Kumar
eb7cb3d7d4 Fixed decimal error in curve connector 2020-06-19 17:18:57 +05:30
Thrilok Kumar
e9f6b3932e Done with aave connector 2020-06-01 04:16:24 +05:30
Thrilok Kumar
3e3bb2b090 Added mainnet address 2020-05-31 03:40:45 +05:30
Thrilok Kumar
9e43874373 Minor changes 2020-05-31 03:38:43 +05:30
Thrilok Kumar
e664e91a41 Minor fix 2020-05-29 02:22:37 +05:30
Thrilok Kumar
1e7ef19452 Lots of refactoring 2020-05-28 04:31:01 +05:30
Thrilok Kumar
8bfc8f6ec7 Major changes 2020-05-28 03:53:38 +05:30
Thrilok Kumar
4b90d3dbf1 Fixed bugs 2020-05-27 05:15:45 +05:30
Thrilok Kumar
e5eb533a31 Added uint(-1) for remove liquidity 2020-05-27 04:49:25 +05:30
Thrilok Kumar
af765feaaf Almost done with uniswap 2020-05-27 03:34:38 +05:30
Thrilok Kumar
42e38682ca Done with aave connector 2020-05-26 00:34:04 +05:30
Samyak Jain
4feda4a6cb withdraw token interface repeating fixed 2020-05-23 23:48:01 +10:00
Samyak Jain
eb62198a10 fixed typo 2020-05-23 22:09:25 +10:00
Samyak Jain
9a931a4036 removed unnecessary require statements 2020-05-23 22:08:22 +10:00
Samyak Jain
09a6932acc code restruturing 2020-05-23 22:08:06 +10:00
Samyak Jain
d9f86e3b68 removed unnecessary require statement 2020-05-23 20:52:48 +10:00