Commit Graph

357 Commits

Author SHA1 Message Date
Hilmar X
b9c5f2935b removed false module comment 2020-09-04 10:28:56 +02:00
Hilmar X
ebd5bd0760 comment formatting 2020-09-04 10:18:59 +02:00
Hilmar X
bae4842bab updated task chain comment 2020-09-04 10:18:00 +02:00
Hilmar X
53e6b6133e added gelato connector 2020-09-03 18:10:52 +02:00
Thrilok kumar
20df1625de
Merge pull request #20 from InstaDApp/Maker-connector-update
Maker connector update
2020-08-23 03:10:16 +05:30
Thrilok kumar
c08f9cc73d
Merge pull request #19 from InstaDApp/curve-gauge-connector-feature
adding curve gauge connector
2020-08-23 03:09:06 +05:30
Thrilok kumar
9ca73dfe77
Merge branch 'master' into curve-vesting-connector-feature 2020-08-23 03:07:06 +05:30
Thrilok Kumar
32ba4e8f32 Added gauge mapping address 2020-08-23 02:22:23 +05:30
Thrilok Kumar
baaaf4ad88 Fixed test cases 2020-08-22 09:32:46 +05:30
Thrilok Kumar
f1c8d60548 Fixed minor bug 2020-08-21 10:09:09 +05:30
Thrilok Kumar
0e014b4126 Added depositAndBorrow function in makerDao 2020-08-21 08:34:37 +05:30
Thrilok Kumar
321b66a861 Minor edits 2020-08-21 03:54:16 +05:30
Thrilok Kumar
654e0b7f58 Merge branch 'curve-gauge-connector-feature' of github.com:InstaDApp/dsa-connectors into curve-gauge-connector-feature 2020-08-21 03:54:05 +05:30
Thrilok Kumar
ee5000da1b Added constructor in mapping gauge 2020-08-21 03:54:01 +05:30
Thrilok kumar
e3bebae9b6
Delete curve_staking.prod.sol 2020-08-21 03:53:38 +05:30
Thrilok Kumar
acfa6d2d36 Added constructor in mapping 2020-08-21 03:49:49 +05:30
Lecky Lao
97832c28a4 Merge branch 'curve-gauge-connector-feature' of github.com:InstaDApp/dsa-connectors into curve-gauge-connector-feature 2020-08-21 03:38:56 +10:00
Lecky Lao
73a5eee1fd added addGaugeMappings into curveGaugeMapping to add multiple mappings;
added test for that;
2020-08-21 03:38:51 +10:00
Thrilok Kumar
8e5f68efbd Removed not used function 2020-08-20 21:57:37 +05:30
Thrilok Kumar
b2a31a24c7 Minor edits 2020-08-20 21:51:54 +05:30
Thrilok Kumar
058fc7d8f5 Code refactoring 2020-08-20 21:46:41 +05:30
Lecky Lao
8a9ce14a9d added test for CurveGauge;
added ABI for CurveGauge;
added MockCurveGauge and MockCurveGaugeMapping;
2020-08-21 01:53:33 +10:00
Lecky Lao
0f9e5f69f1 changed CurveGaugeMapping to use GaugeData to include gaugeAddress and rewardToken;
removed function overload for withdraw and claim by using curveGaugeData;
2020-08-21 00:30:29 +10:00
Lecky Lao
a2b929a794 fixing another withdraw amt balanceOf issue 2020-08-20 23:01:45 +10:00
Lecky Lao
8518f72e37 fixed compiling issues; 2020-08-20 16:09:38 +10:00
Lecky Lao
dbc3698a86 Merge branch 'master' into curve-gauge-connector-feature 2020-08-20 15:51:05 +10:00
Lecky Lao
5afef3d9f0 added amount and rewardAmt for LogClaimedReward;
fixing withdraw -1 to use gauge.balance_Of;
moving same name functions together;
removing setId from withdraw event;
2020-08-20 15:37:36 +10:00
Lecky Lao
8ce92dcb1d fixing compile errors; 2020-08-20 05:39:28 +10:00
Lecky Lao
b4feb0467d added event and function overloading for withdraw and claimReward 2020-08-20 05:37:44 +10:00
Thrilok Kumar
be23d7bba8 Fixed stack too deep error 2020-08-20 00:55:47 +05:30
Thrilok Kumar
4f71c7aa16 minor change 2020-08-20 00:48:59 +05:30
Lecky Lao
d218027001 adding curve gauge mapping;
adding curve gauge connector;
remove trailing spaces;
2020-08-20 05:02:14 +10:00
Thrilok Kumar
3dcb3bea93 minor changes 2020-08-16 02:54:21 +05:30
Thrilok Kumar
755298095f Minor changes 2020-08-15 23:09:09 +05:30
Lecky Lao
522af88811 removing sender as not needed 2020-08-16 03:03:57 +10:00
Lecky Lao
6474ee6b63 added test for curve_vesting.sol;
added MockCurveVesting.sol;
2020-08-16 02:42:09 +10:00
Lecky Lao
010ecfa776 fixing 1inch compile issue;
added curve_testing.sol and got it compiled;
2020-08-16 02:08:35 +10:00
Thrilok kumar
cd427e96f6
Merge pull request #17 from InstaDApp/maker-connector
Removed transfer function from MakerDao connector
2020-08-15 01:55:17 +05:30
Thrilok kumar
22b5e1b36f
Merge pull request #16 from InstaDApp/auth-connector
Updated Auth connector
2020-08-15 01:54:20 +05:30
Thrilok kumar
9a6891c6b1
Merge pull request #15 from InstaDApp/1inch-test-case
Updated 1inch connector
2020-08-15 01:53:24 +05:30
Thrilok Kumar
faaf8fd3a7 MInor change in mapping contract 2020-08-15 01:51:40 +05:30
Thrilok Kumar
5eff1d37dc Minor changes 2020-08-15 01:51:26 +05:30
Thrilok Kumar
ad235465e2 Added oneInch Mapping contract 2020-08-14 02:02:55 +05:30
Thrilok Kumar
498f717ccb Added min one auth condition 2020-08-10 17:53:23 +05:30
Thrilok Kumar
29623faa32 Removed transfer function 2020-08-09 21:39:32 +05:30
Thrilok Kumar
7c6bc47737 Removed fee logics 2020-08-09 21:37:13 +05:30
Thrilok Kumar
feafe9ccbf Updated connectorID 2020-08-09 20:57:21 +05:30
Thrilok Kumar
b128ee663c Removed import files 2020-08-04 15:40:04 +05:30
Thrilok Kumar
37efb0c69c Removed events, setId, getId from chi connector 2020-08-04 15:38:53 +05:30
Thrilok Kumar
a06bb7a5e5 Added CHI connector 2020-08-03 13:19:23 +05:30
Thrilok Kumar
b14642548f test fix 2020-08-03 12:49:29 +05:30
Thrilok Kumar
e8a7a7715e fixed minor bug 2020-08-03 11:15:56 +05:30
Thrilok Kumar
a865f08b4e Minor changes 2020-08-02 22:28:37 +05:30
Thrilok Kumar
05a89af757 Fixed bugs 2020-08-02 22:26:13 +05:30
Thrilok Kumar
2c8bad40fb Stack too deep when compiling inline assembly Error 2020-07-31 20:03:21 +05:30
Thrilok Kumar
eb1dc5d665 Code refactoring 2020-07-31 19:03:32 +05:30
Thrilok Kumar
8344057327 Major Refactoring 2020-07-31 13:01:21 +05:30
Thrilok Kumar
6d278d1648 Done refactoring 2020-07-30 18:50:25 +05:30
Thrilok Kumar
dd48873a1a Refactored events 2020-07-30 17:26:39 +05:30
Thrilok Kumar
5ceaf7f7fc Added fee taker function 2020-07-29 19:21:14 +05:30
Thrilok Kumar
991af63d50 Updated function names 2020-07-24 18:28:26 +05:30
Thrilok Kumar
9feba3a72a Updated 1proto address 2020-07-24 18:22:04 +05:30
Thrilok Kumar
be859fdd93 Code refactoring 2020-07-24 17:29:21 +05:30
Thrilok Kumar
fbce76935e Minore changes 2020-07-24 16:47:19 +05:30
Thrilok Kumar
c4a58a1fea Merge branch 'master' of github.com:InstaDApp/dsa-connectors 2020-07-24 16:42:10 +05:30
Thrilok Kumar
e6574acdad Done with 1inch connector 2020-07-24 16:42:04 +05:30
Thrilok kumar
92c060102d
Merge pull request #13 from InstaDApp/ycurve-connector
Added curve-y connector
2020-07-24 14:05:02 +05:30
Thrilok Kumar
6ef89a38fc Fixed events 2020-07-20 22:23:54 +05:30
Thrilok Kumar
737423a6b4 Done with staking contract 2020-07-19 20:31:00 +05:30
Lecky Lao
f00b2a74e2 changing getStakingData back to internal to reduce dependancy; 2020-07-19 22:56:05 +10:00
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
Thrilok Kumar
9d8714a163 Fixed bug 2020-07-18 00:56:22 +05:30
Samyak Jain
a12b7ec607 function name change 2020-07-18 04:01:03 +10:00
Samyak Jain
aaa99ff3a4 added events to instapoolFee 2020-07-18 02:43:43 +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
Thrilok Kumar
18eedb8833 Minor changes in mapping contract 2020-07-14 22:55:45 +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
819fead058
Created staking mapping contract 2020-07-13 21:02:50 +05:30
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
ea52262f2f Merge branch 'synthetix-connector' of github.com:InstaDApp/dsa-connectors into synthetix-connector 2020-07-09 16:51:44 +05:30
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
Lecky Lao
3bb6ab8a52 remove trailing spaces;
added mocks contract;
adding tests;
2020-07-08 23:55:25 +10:00
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
Thrilok Kumar
d089fdb8d0 Minor change 2020-07-04 22:12:56 +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
Thrilok Kumar
66edeb2e19 Fixed safemath issue 2020-07-02 10:26:47 +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