Mutli-Block Finalization

contracts/staking/CHANGELOG.json

@@ -57,6 +57,10 @@
             {
                 "note": "Refactored out `_cobbDouglas()` into its own library",
                 "pr": 2179
+            },
+            {
+                "note": "Introduce multi-block finalization.",
+                "pr": 2155
             }
         ]
     }

contracts/staking/contracts/src/Staking.sol

@@ -21,14 +21,30 @@ pragma experimental ABIEncoderV2;
 
 import "./interfaces/IStaking.sol";
 import "./sys/MixinParams.sol";
+import "./sys/MixinFinalizer.sol";
 import "./stake/MixinStake.sol";
 import "./staking_pools/MixinStakingPool.sol";
 import "./fees/MixinExchangeFees.sol";
 
 
 contract Staking is
     IStaking,
+    IStakingEvents,
+    MixinAbstract,
+    MixinConstants,
+    MixinDeploymentConstants,
+    Ownable,
+    MixinStorage,
+    MixinStakingPoolModifiers,
+    MixinExchangeManager,
+    MixinScheduler,
     MixinParams,
+    MixinStakeStorage,
+    MixinStakingPoolMakers,
+    MixinStakeBalances,
+    MixinCumulativeRewards,
+    MixinStakingPoolRewards,
+    MixinFinalizer,
     MixinStakingPool,
     MixinStake,
     MixinExchangeFees
@@ -51,9 +67,9 @@ contract Staking is
         address _wethProxyAddress,
         address _ethVaultAddress,
         address payable _rewardVaultAddress,
-        address _zrxVaultAddress        
+        address _zrxVaultAddress
     )
-        external
+        public
         onlyAuthorized
     {
         // DANGER! When performing upgrades, take care to modify this logic

contracts/staking/contracts/src/StakingProxy.sol

@@ -27,6 +27,8 @@ import "./interfaces/IStakingProxy.sol";
 
 contract StakingProxy is
     IStakingProxy,
+    MixinConstants,
+    Ownable,
     MixinStorage
 {
     using LibProxy for address;
@@ -73,7 +75,7 @@ contract StakingProxy is
 
     /// @dev Attach a staking contract; future calls will be delegated to the staking contract.
     /// Note that this is callable only by this contract's owner.
-    /// @param _stakingContract Address of staking contract. 
+    /// @param _stakingContract Address of staking contract.
     /// @param _wethProxyAddress The address that can transfer WETH for fees.
     ///        Use address in storage if NIL_ADDRESS is passed in.
     /// @param _ethVaultAddress Address of the EthVault contract.
@@ -207,6 +209,14 @@ contract StakingProxy is
             ));
         }
 
+        // Minimum stake must be > 1
+        if (minimumPoolStake < 2) {
+            LibRichErrors.rrevert(
+                LibStakingRichErrors.InvalidParamValueError(
+                    LibStakingRichErrors.InvalidParamValueErrorCode.InvalidMinimumPoolStake
+            ));
+        }
+
         // ERC20Proxy and Vault contract addresses must always be initialized
         if (address(wethAssetProxy) == NIL_ADDRESS) {
             LibRichErrors.rrevert(