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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sowmay Jain
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							dea131f846
							
						
					 | 
					
						
						
							
							Merge pull request #5 from InstaDApp/flusher-edits
						
						
						
						
						
						
						
						Flusher improvements 
						
					 | 
					
						2020-08-27 18:24:29 +10:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Lecky Lao
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							8bde5a5d0f
							
						
					 | 
					
						
						
							
							Merge pull request #2 from InstaDApp/fix-pausable
						
						
						
						
						
						
						
						fixed ERC20Pausable and added ReentrancyGuard 
						
					 | 
					
						2020-08-26 02:11:09 +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
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							35d7c9e345
							
						
					 | 
					
						
						
							
							Update README.md
						
						
						
						
						
					 | 
					
						2020-08-25 22:18:30 +10:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sowmay Jain
							
						 
					 | 
					
						
						
						
						
							
						
						
							e5d80f2a2c
							
						
					 | 
					
						
						
							
							shut => pause
						
						
						
						
						
					 | 
					
						2020-08-25 04:01:28 +10:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Samyak Jain
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							d6bac5f3ae
							
						
					 | 
					
						
						
							
							Merge pull request #1 from InstaDApp/basic-structure
						
						
						
						
						
						
						
						All the major code is done. 
						
					 | 
					
						2020-08-25 03:36:22 +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 | 
					
					
						
						
							
							
							
						
					 |