xianny 
							
						 
					 
					
						
						
							
						
						f65d8cc325 
					 
					
						
						
							
							Updated CHANGELOGS & MD docs  
						
						 
						
						
						
						
					 
					
						2019-11-05 16:58:00 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Greg Hysen 
							
						 
					 
					
						
						
							
						
						2d0ad6f181 
					 
					
						
						
							
							Updated staking changelog  
						
						 
						
						
						
						
					 
					
						2019-11-05 15:32:35 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Greg Hysen 
							
						 
					 
					
						
						
							
						
						a7f0717afb 
					 
					
						
						
							
							Unit tests for MixinCumulativeRewards  
						
						 
						
						
						
						
					 
					
						2019-11-05 15:32:04 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Greg Hysen 
							
						 
					 
					
						
						
							
						
						9b2231ed24 
					 
					
						
						
							
							Improved readability on some tests + updated staking changelog  
						
						 
						
						
						
						
					 
					
						2019-11-05 14:59:55 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Greg Hysen 
							
						 
					 
					
						
						
							
						
						c123200f38 
					 
					
						
						
							
							Unit tests for MixinScheduler  
						
						 
						
						
						
						
					 
					
						2019-11-04 15:44:46 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lawrence Forman 
							
						 
					 
					
						
						
							
						
						47e050cbaf 
					 
					
						
						
							
							Merge pull request  #2312  from 0xProject/feat/contracts/staking/MixinStakingPoolRewards-unit-tests  
						
						 
						
						... 
						
						
						
						MixinStakingPoolRewards unit tests 
						
						
					 
					
						2019-11-04 17:19:03 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lawrence Forman 
							
						 
					 
					
						
						
							
						
						c957b48281 
					 
					
						
						
							
							@0x/contracts-staking: Run prettier. 
						
						 
						
						
						
						
					 
					
						2019-11-04 11:10:07 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lawrence Forman 
							
						 
					 
					
						
						
							
						
						c15c5e12b0 
					 
					
						
						
							
							@0x/contracts-staking: Fix event name collision in MixinStakingPoolRewards unit tests. 
						
						 
						
						
						
						
					 
					
						2019-11-04 11:09:21 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lawrence Forman 
							
						 
					 
					
						
						
							
						
						15c3c8074c 
					 
					
						
						
							
							@0x/contracts-staking: Add separate unit tests for withdrawDelegatorRewards() and _withdrawAndSyncDelegatorRewards(). 
						
						 
						
						
						
						
					 
					
						2019-11-04 10:43:37 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lawrence Forman 
							
						 
					 
					
						
						
							
						
						cba72c811d 
					 
					
						
						
							
							@0x/contracts-staking: Add _computePoolRewardsSplit() tests to MixinStakingPoolRewards unit tests. 
						
						 
						
						
						
						
					 
					
						2019-11-04 10:43:37 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lawrence Forman 
							
						 
					 
					
						
						
							
						
						28a2e56003 
					 
					
						
						
							
							@0x/contracts-staking: Add more MixinStakingPoolRewards unit tests. 
						
						 
						
						
						
						
					 
					
						2019-11-04 10:43:37 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lawrence Forman 
							
						 
					 
					
						
						
							
						
						8c4c3d56c6 
					 
					
						
						
							
							@0x/contracts-staking: Create MixinStakingPoolRewards unit tests. 
						
						 
						
						
						
						
					 
					
						2019-11-04 10:43:37 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lawrence Forman 
							
						 
					 
					
						
						
							
						
						4f56d68689 
					 
					
						
						
							
							@0x/contracts-staking: Fix overflow w/ LibFixedMath._mul(-1, -2*255). 
						
						 
						
						
						
						
					 
					
						2019-11-01 13:35:23 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Greg Hysen 
							
						 
					 
					
						
						
							
						
						3a1c464543 
					 
					
						
						
							
							Readability improvements to Staking Proxy unit tests + one extra case  
						
						 
						
						
						
						
					 
					
						2019-11-01 09:59:17 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Greg Hysen 
							
						 
					 
					
						
						
							
						
						a0c2f6b7b4 
					 
					
						
						
							
							Updated Staking changelog  
						
						 
						
						
						
						
					 
					
						2019-10-31 18:25:33 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Greg Hysen 
							
						 
					 
					
						
						
							
						
						7bfbf0ad3a 
					 
					
						
						
							
							Staking Proxy unit tests + Staking Proxy fallback reverts if no staking contract is attached  
						
						 
						
						
						
						
					 
					
						2019-10-31 18:22:49 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Zhu 
							
						 
					 
					
						
						
							
						
						7aa88307f6 
					 
					
						
						
							
							Flesh out fillOrder integration tests  
						
						 
						
						
						
						
					 
					
						2019-10-31 15:27:39 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lawrence Forman 
							
						 
					 
					
						
						
							
						
						a02892cbc8 
					 
					
						
						
							
							@0x/contracts-staking: Remove duplicated test case in MixinStakeBalances unit tests. 
						
						 
						
						
						
						
					 
					
						2019-10-29 07:37:06 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lawrence Forman 
							
						 
					 
					
						
						
							
						
						49c67fbb18 
					 
					
						
						
							
							@0x/contracts-staking: Remove unused lodash import and only modifier from MixinStakeBalances unit tests. 
						
						 
						
						
						
						
					 
					
						2019-10-29 07:37:06 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lawrence Forman 
							
						 
					 
					
						
						
							
						
						6f2e79208a 
					 
					
						
						
							
							@0x/contracts-staking: Add MixinStakeBalances unit tests. 
						
						 
						
						
						
						
					 
					
						2019-10-29 07:37:06 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Greg Hysen 
							
						 
					 
					
						
						
							
						
						9c181f09ba 
					 
					
						
						
							
							Removed LibProxy and inlined proxy call in StakingProxy.  
						
						 
						
						
						
						
					 
					
						2019-10-28 16:42:52 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Amir Bandeali 
							
						 
					 
					
						
						
							
						
						f246314b1d 
					 
					
						
						
							
							Update default alpha from 1/2 to 2/3  
						
						 
						
						
						
						
					 
					
						2019-10-27 16:53:57 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Amir Bandeali 
							
						 
					 
					
						
						
							
						
						33a0c22021 
					 
					
						
						
							
							Remove tests related to read-only mode  
						
						 
						
						
						
						
					 
					
						2019-10-27 11:12:22 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Amir Bandeali 
							
						 
					 
					
						
						
							
						
						58e9c70203 
					 
					
						
						
							
							Remove read-only mode related functions, storage variables, and contracts  
						
						 
						
						
						
						
					 
					
						2019-10-27 11:12:16 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lawrence Forman 
							
						 
					 
					
						
						
							
						
						1c695b2759 
					 
					
						
						
							
							Rebase onto 3.0  
						
						 
						
						
						
						
					 
					
						2019-10-25 10:56:03 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lawrence Forman 
							
						 
					 
					
						
						
							
						
						b1b1162b60 
					 
					
						
						
							
							@0x/contracts-staking: Add MixinStakingPool unit tests. 
						
						 
						
						
						
						
					 
					
						2019-10-25 10:55:03 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Greg Hysen 
							
						 
					 
					
						
						
							
						
						8e8ea6a3ab 
					 
					
						
						
							
							Created IZrxVaultBackstop and updated IStaking.  
						
						 
						
						
						
						
					 
					
						2019-10-24 15:58:51 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Greg Hysen 
							
						 
					 
					
						
						
							
						
						cc7452da8f 
					 
					
						
						
							
							Replaced protocolFeePaid -> protocolFeeAmount. Changed some wording in comments.  
						
						 
						
						
						
						
					 
					
						2019-10-24 15:58:18 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lawrence Forman 
							
						 
					 
					
						
						
							
						
						07e1d502e7 
					 
					
						
						
							
							@0x/contracts-staking: Update changelog. 
						
						 
						
						
						
						
					 
					
						2019-10-23 04:40:47 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lawrence Forman 
							
						 
					 
					
						
						
							
						
						703e890918 
					 
					
						
						
							
							@0x/contracts-staking: Call StakingProxy.assertValidStorageParams() in MixinParams.setParams() 
						
						 
						
						
						
						
					 
					
						2019-10-23 04:40:47 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Greg Hysen 
							
						 
					 
					
						
						
							
						
						c676ecb8cf 
					 
					
						
						
							
							Force no-op when moving zero stake or moving from undelegated to undelegated.  
						
						 
						
						
						
						
					 
					
						2019-10-22 15:39:24 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Greg Hysz 
							
						 
					 
					
						
						
							
						
						575af6b6e8 
					 
					
						
						
							
							Merge pull request  #2278  from 0xProject/fix/3.0/removeProtocolFeeZeroAssertion  
						
						 
						
						... 
						
						
						
						Remove assertion that protocol fee != zero 
						
						
					 
					
						2019-10-22 13:24:59 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mzhu25 
							
						 
					 
					
						
						
							
						
						1237c7d479 
					 
					
						
						
							
							Merge pull request  #2277  from 0xProject/fix/3.0/rmeove-staking-fallback  
						
						 
						
						... 
						
						
						
						Remove payable fallback from Staking.sol 
						
						
					 
					
						2019-10-22 12:46:13 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Greg Hysen 
							
						 
					 
					
						
						
							
						
						c44e16a88f 
					 
					
						
						
							
							Removed assertion that protocol fee != 0 from staking contract.  
						
						 
						
						
						
						
					 
					
						2019-10-22 12:42:04 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Zhu 
							
						 
					 
					
						
						
							
						
						74a2c3a199 
					 
					
						
						
							
							Remove payable fallback from Staking.sol  
						
						 
						
						
						
						
					 
					
						2019-10-22 12:15:07 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Greg Hysen 
							
						 
					 
					
						
						
							
						
						9ac715f99d 
					 
					
						
						
							
							Protocol fee amount is not enforced by staking contract  
						
						 
						
						
						
						
					 
					
						2019-10-22 12:10:34 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Greg Hysen 
							
						 
					 
					
						
						
							
						
						22e39f782f 
					 
					
						
						
							
							Some (more) readability improvements and minor optimizations to staking finalization.  
						
						 
						
						
						
						
					 
					
						2019-10-22 12:09:18 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Greg Hysen 
							
						 
					 
					
						
						
							
						
						d91a7fc663 
					 
					
						
						
							
							Some readability improvements and minor optimizations to staking finalization.  
						
						 
						
						
						
						
					 
					
						2019-10-22 11:02:25 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Greg Hysen 
							
						 
					 
					
						
						
							
						
						ce8fd44234 
					 
					
						
						
							
							Removed lingering references to stale terminology ("active pools")  
						
						 
						
						
						
						
					 
					
						2019-10-22 11:02:25 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Greg Hysen 
							
						 
					 
					
						
						
							
						
						6617ad9531 
					 
					
						
						
							
							Refactored finalization state.  
						
						 
						
						... 
						
						
						
						1. Removes state variables:
   - totalWeightedStakeThisEpoch
   - totalFeesCollectedThisEpoch
   - numActivePoolsThisEpoch
2. No longer indexes by epoch % 2
3. Renamed event StakingPoolActivated → StakingPoolEarnedRewards.
4. Renamed structs:
   - ActivePool → PoolStats. This holds stats for a pool that earned rewards.
   - UnfinalizedState → AggregatedStats. This aggregates stats from the former struct. 
						
						
					 
					
						2019-10-22 11:02:25 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Amir Bandeali 
							
						 
					 
					
						
						
							
						
						e7dc7167d0 
					 
					
						
						
							
							Sync delegatedStakeToPoolByOwner whenever _withdrawAndSyncDelegatorRewards is called  
						
						 
						
						
						
						
					 
					
						2019-10-22 09:38:18 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Amir Bandeali 
							
						 
					 
					
						
						
							
						
						359b804001 
					 
					
						
						
							
							Add test for withdrawing rewards before epoch is finalized  
						
						 
						
						
						
						
					 
					
						2019-10-21 22:27:06 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Amir Bandeali 
							
						 
					 
					
						
						
							
						
						44dac2cd80 
					 
					
						
						
							
							Fix tests that assume touching stake will finalize pool  
						
						 
						
						
						
						
					 
					
						2019-10-21 22:27:06 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Amir Bandeali 
							
						 
					 
					
						
						
							
						
						a66ea2bf74 
					 
					
						
						
							
							Assert that pool has been finalized in _withdrawAndSyncDelegatorRewards rather than calling finalizePool  
						
						 
						
						
						
						
					 
					
						2019-10-21 22:27:06 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Amir Bandeali 
							
						 
					 
					
						
						
							
						
						a362e9d2d8 
					 
					
						
						
							
							Use safeMath where possible  
						
						 
						
						
						
						
					 
					
						2019-10-21 22:27:06 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Amir Bandeali 
							
						 
					 
					
						
						
							
						
						1885957bd3 
					 
					
						
						
							
							Update tests to start at epoch 1  
						
						 
						
						
						
						
					 
					
						2019-10-21 22:27:06 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Amir Bandeali 
							
						 
					 
					
						
						
							
						
						1a409c3731 
					 
					
						
						
							
							Initialize currentEpoch at 1 instead of 0  
						
						 
						
						
						
						
					 
					
						2019-10-21 22:27:06 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Amir Bandeali 
							
						 
					 
					
						
						
							
						
						7b7c64fc6a 
					 
					
						
						
							
							Add assertion function that checks if pool was finalized last epoch  
						
						 
						
						
						
						
					 
					
						2019-10-21 22:27:06 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lawrence Forman 
							
						 
					 
					
						
						
							
						
						d0884dcb4d 
					 
					
						
						
							
							Merge pull request  #2267  from 0xProject/feat/3.0/staking/MixinStake-unit-tests  
						
						 
						
						... 
						
						
						
						Create MixinStake unit tests 
						
						
					 
					
						2019-10-18 11:41:18 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lawrence Forman 
							
						 
					 
					
						
						
							
						
						c7ca625408 
					 
					
						
						
							
							@0x/contracts-staking: Fix MixinStake unit tests typo. 
						
						 
						
						
						
						
					 
					
						2019-10-18 10:45:07 -04:00