143 Commits

Author	SHA1	Message	Date
Samyak Jain	53838909ec	new updates implemented	2020-09-06 22:08:29 +10:00
Thrilok Kumar	e11f9553c7	Fixed withdraw event typo	2020-08-31 23:43:09 +05:30
Thrilok kumar	90b28b40b0	Merge pull request #9 from InstaDApp/last-edits ... Last edits	2020-08-31 23:38:36 +05:30
Thrilok Kumar	4b9f9ed583	Done with erc20 and eth pool test cases	2020-08-31 23:37:54 +05:30
Thrilok kumar	e88b99245a	Fixed withdraw bug in eth pool	2020-08-31 14:59:14 +05:30
Thrilok kumar	5f58d8eedc	Fixed withdraw bug	2020-08-31 14:58:46 +05:30
Thrilok kumar	a5c45ce761	Merge pull request #8 from InstaDApp/last-edits ... Merging last-edits in testcases	2020-08-31 14:32:55 +05:30
Thrilok Kumar	d383ec4e3a	Fixed max withdrawal bug	2020-08-31 12:59:20 +05:30
Thrilok Kumar	ee9e1b39d0	Set max if amount higher than max withdraw amount	2020-08-31 12:54:45 +05:30
Thrilok Kumar	d43a1509ee	Check to is vaild for withdraw function	2020-08-31 00:49:38 +05:30
Thrilok Kumar	8bcec5c0ac	Added comments in registry.sol	2020-08-31 00:42:23 +05:30
Thrilok Kumar	2da1029857	Added comments; Added user address in deposit and withdraw	2020-08-31 00:16:03 +05:30
Thrilok Kumar	1c2bd398f1	Minor edits; Added dsa address in LogDeploy	2020-08-30 23:40:32 +05:30
Thrilok Kumar	a7fae35c8b	WIP: done with registry test cases	2020-08-30 23:33:16 +05:30
Sowmay Jain	99938ad737	fixed event emit on erc20	2020-08-31 03:38:58 +10:00
Sowmay Jain	86701e67bc	simplified withdrawInsurance() method	2020-08-31 03:35:51 +10:00
Sowmay Jain	dac3be57fe	fixed deposit bug	2020-08-31 03:08:40 +10:00
Sowmay Jain	11410e0d5e	setExchangeRate() diagnosis completed	2020-08-31 02:33:07 +10:00
Sowmay Jain	6a6a7f51e5	similar changes to previous to erc20 as well	2020-08-31 01:52:16 +10:00
Sowmay Jain	07c2b67b63	created common getter for current rate	2020-08-31 01:47:40 +10:00
Sowmay Jain	3cc84a904a	fixed an insurance amount (ZERO'd) bug	2020-08-31 01:46:39 +10:00
Sowmay Jain	365a91ed10	Merge branch 'master' of https://github.com/InstaDApp/dsa-yield-contract	2020-08-30 23:34:04 +10:00
Sowmay Jain	18d9f405e3	edits	2020-08-30 23:34:01 +10:00
Thrilok Kumar	93e809d852	Minor edits	2020-08-30 19:03:19 +05:30
Thrilok Kumar	5335fb7189	added auth condition in eth pool also	2020-08-30 19:03:06 +05:30
Sowmay Jain	1b6e03ebd2	updated comments and removed pool cap	2020-08-30 23:27:03 +10:00
Thrilok kumar	a426722e57	Update registry.sol	2020-08-30 18:29:41 +05:30
Samyak Jain	3a9287ebb4	Merge branch 'master' of https://github.com/InstaDApp/dsa-yield-contract	2020-08-30 22:50:39 +10:00
Samyak Jain	e79e2cd970	added withdrawal fee	2020-08-30 22:50:37 +10:00
Thrilok Kumar	c21c942d25	Removed payable from unused functions	2020-08-30 09:46:08 +05:30
Samyak Jain	b73c7be2e1	Merge branch 'master' of https://github.com/InstaDApp/dsa-yield-contract	2020-08-30 01:24:23 +10:00
Samyak Jain	bb675975ce	withdraw insurance amount function	2020-08-30 01:24:21 +10:00
Sowmay Jain	070cee7eb0	removed proxy address from event	2020-08-29 04:57:25 +10:00
Thrilok Kumar	bff591e085	Code refactor	2020-08-28 23:41:36 +05:30
Samyak Jain	f8c117c513	updated is loss is greater than insurance amount	2020-08-29 03:56:34 +10:00
Thrilok Kumar	8079b3476d	Fixed lib path in pools	2020-08-28 22:42:59 +05:30
Thrilok Kumar	ff5af899d5	Updated file structure	2020-08-28 22:42:21 +05:30
Thrilok Kumar	0c0bb39cbf	Fixed bug in flusher contract	2020-08-28 22:00:38 +05:30
Thrilok Kumar	e39705a1de	Added get length function for token pool dsa	2020-08-27 20:16:40 +05:30
Thrilok Kumar	f9d167a3a8	Added dsa array	2020-08-27 20:07:03 +05:30
Thrilok kumar	a81ed67a7e	Merge branch 'master' into variable-exchangeRate-decimal	2020-08-27 17:37:32 +05:30
Thrilok Kumar	581de54d23	code refactor	2020-08-27 17:32:23 +05:30
Thrilok Kumar	1cf3106273	minor edit	2020-08-27 17:30:48 +05:30
Thrilok Kumar	f63a3fc04d	Added token paramater in deploy function	2020-08-27 17:26:31 +05:30
Samyak Jain	27be4fbfd1	ethPool exchange rate changes	2020-08-27 21:02:09 +10:00
Samyak Jain	8e4cbd8863	chnaged exchange rate modal	2020-08-27 20:23:04 +10:00
Sowmay Jain	0f3a6e95d0	added name to event parameter	2020-08-27 18:50:44 +10:00
Samyak Jain	13f8131257	Merge pull request #4 from InstaDApp/Multiple-dsa-support ... Multiple dsa support	2020-08-27 18:35:57 +10:00
Thrilok kumar	9c8e40658b	Delete batchingProxy.sol	2020-08-27 14:05:42 +05:30
Samyak Jain	1589018a85	Update registry.sol ... Update in addDsa to add any DSA.	2020-08-27 18:35:33 +10:00
Thrilok kumar	3d2868bfbd	Delete dai.sol	2020-08-27 14:05:26 +05:30
Thrilok Kumar	66bee61f9f	checking is there is token pool or not	2020-08-27 12:35:41 +05:30
Thrilok Kumar	1964045812	Fixed deposit event error	2020-08-27 12:34:30 +05:30
Thrilok Kumar	7df9dec72a	Merge branch 'flusher-edits' of https://github.com/InstaDApp/dsa-yield-contract into flusher-edits	2020-08-27 12:33:47 +05:30
Thrilok Kumar	56bfe94a64	Added more require statement in setBasic() func	2020-08-27 12:33:44 +05:30
Sowmay Jain	3582cf30ec	revert: can't change flusher owner in any case	2020-08-27 17:00:02 +10:00
Sowmay Jain	51f2867cf1	an open end to change owner via spell()	2020-08-27 16:57:57 +10:00
Sowmay Jain	85bd5774b8	removed "withdraw to owner" from deposit() method	2020-08-27 16:57:27 +10:00
Sowmay Jain	e7e13bf44d	removed an extra parameter from event	2020-08-27 16:56:36 +10:00
Thrilok Kumar	73492a3450	setting exchange rate in constructor	2020-08-27 12:26:00 +05:30
Thrilok Kumar	abeeb63865	Added variable exchange rate	2020-08-27 12:23:28 +05:30
Thrilok Kumar	de4232c233	fixed calulation error	2020-08-27 00:49:48 +05:30
Thrilok Kumar	4e423adf1a	addDsa will create new DSA and add it	2020-08-26 22:16:54 +05:30
Thrilok Kumar	6109d0c003	Added more auth check in token pool	2020-08-26 22:16:39 +05:30
Thrilok kumar	87b2500483	Changed from 90 days to 30 days shield time	2020-08-26 21:08:11 +05:30
Thrilok Kumar	da816bb20f	Merge branch 'master' of https://github.com/InstaDApp/dsa-yield-contract	2020-08-26 19:11:23 +05:30
Thrilok Kumar	8e0bdbd352	Added batching contract	2020-08-26 19:11:04 +05:30
Samyak Jain	24e4d6a8df	added multiple DSA support	2020-08-26 23:35:10 +10:00
Thrilok Kumar	4eb0719b5a	Removed TODO	2020-08-25 21:32:13 +05:30
Thrilok Kumar	4e3ada0503	Minor edits	2020-08-25 21:29:14 +05:30
Lecky Lao	f96e3199cf	adding ReentrancyGuard	2020-08-26 01:54:42 +10:00
Lecky Lao	850da87ca3	fixed warning messages; ... fixed indentation; fixed ERC20Pausable compile issue;	2020-08-26 01:49:21 +10:00
Thrilok Kumar	3176c358ba	Added Pausable lib	2020-08-25 20:02:59 +05:30
Thrilok Kumar	79779c9269	added more require statements	2020-08-25 19:51:21 +05:30
Thrilok Kumar	525d2ab403	minor change	2020-08-25 19:50:00 +05:30
Thrilok Kumar	3dea5e8cb0	Changed to isMaster for updatePoolLogic	2020-08-25 19:48:32 +05:30
Sowmay Jain	e5d80f2a2c	shut => pause	2020-08-25 04:01:28 +10:00
Sowmay Jain	ad1d396045	statement edits	2020-08-25 03:33:44 +10:00
Sowmay Jain	8b20da9574	deposit() payable and receive()	2020-08-25 03:32:13 +10:00
Samyak Jain	696b2e7233	merge flusher repo & updates in eth pool	2020-08-25 03:30:39 +10:00
Thrilok Kumar	bf3d7d77c7	Eth pool minor edits	2020-08-24 06:58:23 +05:30
Thrilok Kumar	b4ad315f33	Minor edits	2020-08-24 06:45:28 +05:30
Thrilok Kumar	2f0549b709	Updated file structure	2020-08-24 06:10:01 +05:30
Samyak Jain	26e86c9436	withdraw return uint	2020-08-23 23:16:13 +10:00
Samyak Jain	a115927405	event added and eth edits	2020-08-23 22:42:32 +10:00
Samyak Jain	29dbb98bea	ethPool done	2020-08-23 22:05:09 +10:00
Samyak Jain	e879ff4d85	instapool done events remaining	2020-08-23 20:53:01 +10:00
Samyak Jain	64518a43ff	tokenPool contract basics	2020-08-23 04:48:23 +10:00
Sowmay Jain	108d118250	minor change	2020-08-22 21:50:42 +10:00
Sowmay Jain	dd00b6f8ae	minor changes	2020-08-22 16:48:15 +10:00
Thrilok Kumar	5fc9feab5d	Added TODOs	2020-08-22 08:59:54 +05:30
Thrilok Kumar	82584a71ed	Basic contracts. WIP	2020-08-22 08:37:55 +05:30
Thrilok Kumar	1c0d4bfae6	First commit	2020-08-22 03:52:07 +05:30