Add initialize to Keeper, VaultsRegistry

abi/Errors.json

@@ -84,6 +84,11 @@
     "name": "InvalidHealthFactor",
     "type": "error"
   },
+  {
+    "inputs": [],
+    "name": "InvalidInitialHarvest",
+    "type": "error"
+  },
   {
     "inputs": [],
     "name": "InvalidLiqBonusPercent",
@@ -184,11 +189,6 @@
     "name": "MaxOraclesExceeded",
     "type": "error"
   },
-  {
-    "inputs": [],
-    "name": "NegativeAssetsDelta",
-    "type": "error"
-  },
   {
     "inputs": [],
     "name": "NotCollateralized",

abi/IKeeper.json

@@ -392,6 +392,19 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "_owner",
+        "type": "address"
+      }
+    ],
+    "name": "initialize",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [
       {

abi/IVaultsRegistry.json

@@ -128,6 +128,19 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "_owner",
+        "type": "address"
+      }
+    ],
+    "name": "initialize",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [
       {

contracts/interfaces/IKeeper.sol

@@ -12,5 +12,9 @@ import {IKeeperRewards} from './IKeeperRewards.sol';
  * @notice Defines the interface for the Keeper contract
  */
 interface IKeeper is IKeeperOracles, IKeeperRewards, IKeeperValidators {
-
+  /**
+   * @notice Initializes the Keeper contract. Can only be called once.
+   * @param _owner The address of the owner
+   */
+  function initialize(address _owner) external;
 }

contracts/interfaces/IVaultsRegistry.sol

@@ -89,4 +89,10 @@ interface IVaultsRegistry {
    * @param factory The address of the factory to remove from the whitelist
    */
   function removeFactory(address factory) external;
+
+  /**
+   * @notice Function for initializing the registry. Can only be called once during the deployment.
+   * @param _owner The address of the owner of the contract
+   */
+  function initialize(address _owner) external;
 }

contracts/keeper/Keeper.sol

@@ -9,13 +9,16 @@ import {IKeeper} from '../interfaces/IKeeper.sol';
 import {KeeperValidators} from './KeeperValidators.sol';
 import {KeeperRewards} from './KeeperRewards.sol';
 import {KeeperOracles} from './KeeperOracles.sol';
+import {Errors} from '../libraries/Errors.sol';
 
 /**
  * @title Keeper
  * @author StakeWise
  * @notice Defines the functionality for updating Vaults' rewards and approving validators registrations
  */
 contract Keeper is KeeperOracles, KeeperRewards, KeeperValidators, IKeeper {
+  bool private _initialized;
+
   /**
    * @dev Constructor
    * @param sharedMevEscrow The address of the shared MEV escrow contract
@@ -37,4 +40,14 @@ contract Keeper is KeeperOracles, KeeperRewards, KeeperValidators, IKeeper {
     KeeperRewards(sharedMevEscrow, vaultsRegistry, osToken, _rewardsDelay, maxAvgRewardPerSecond)
     KeeperValidators(validatorsRegistry)
   {}
+
+  /// @inheritdoc IKeeper
+  function initialize(address _owner) external override onlyOwner {
+    if (_owner == address(0)) revert Errors.ZeroAddress();
+    if (_initialized) revert Errors.AccessDenied();
+
+    // transfer ownership
+    _transferOwnership(_owner);
+    _initialized = true;
+  }
 }

contracts/libraries/Errors.sol

@@ -53,6 +53,6 @@ library Errors {
   error InvalidCheckpointIndex();
   error InvalidCheckpointValue();
   error MaxOraclesExceeded();
-  error NegativeAssetsDelta();
+  error InvalidInitialHarvest();
   error ClaimTooEarly();
 }

contracts/misc/CumulativeMerkleDrop.sol

@@ -22,8 +22,7 @@ contract CumulativeMerkleDrop is Ownable2Step, ICumulativeMerkleDrop {
    * @param _owner The address of the owner of the contract
    * @param _token The address of the token contract
    */
-  constructor(address _owner, address _token) Ownable(msg.sender) {
-    _transferOwnership(_owner);
+  constructor(address _owner, address _token) Ownable(_owner) {
     token = IERC20(_token);
   }
 

contracts/osToken/OsToken.sol

@@ -51,6 +51,7 @@ contract OsToken is ERC20, Ownable2Step, IOsToken {
    * @param _keeper The address of the Keeper contract
    * @param _checker The address of the OsTokenChecker contract
    * @param _treasury The address of the DAO treasury
+   * @param _owner The address of the owner of the contract
    * @param _feePercent The fee percent applied on the rewards
    * @param _capacity The amount after which the osToken stops accepting deposits
    * @param _name The name of the ERC20 token
@@ -60,18 +61,21 @@ contract OsToken is ERC20, Ownable2Step, IOsToken {
     address _keeper,
     address _checker,
     address _treasury,
+    address _owner,
     uint16 _feePercent,
     uint256 _capacity,
     string memory _name,
     string memory _symbol
   ) ERC20(_name, _symbol) Ownable(msg.sender) {
+    if (_owner == address(0)) revert Errors.ZeroAddress();
     keeper = _keeper;
     checker = _checker;
     _lastUpdateTimestamp = uint64(block.timestamp);
 
     setCapacity(_capacity);
     setTreasury(_treasury);
     setFeePercent(_feePercent);
+    _transferOwnership(_owner);
   }
 
   /// @inheritdoc IERC20

contracts/vaults/VaultsRegistry.sol

@@ -21,6 +21,8 @@ contract VaultsRegistry is Ownable2Step, IVaultsRegistry {
   /// @inheritdoc IVaultsRegistry
   mapping(address => bool) public override vaultImpls;
 
+  bool private _initialized;
+
   /**
    * @dev Constructor
    */
@@ -61,4 +63,14 @@ contract VaultsRegistry is Ownable2Step, IVaultsRegistry {
     factories[factory] = false;
     emit FactoryRemoved(factory);
   }
+
+  /// @inheritdoc IVaultsRegistry
+  function initialize(address _owner) external override onlyOwner {
+    if (_owner == address(0)) revert Errors.ZeroAddress();
+    if (_initialized) revert Errors.AccessDenied();
+
+    // transfer ownership
+    _transferOwnership(_owner);
+    _initialized = true;
+  }
 }

contracts/vaults/ethereum/EthGenesisVault.sol

@@ -118,7 +118,9 @@ contract EthGenesisVault is Initializable, EthVault, IEthGenesisVault {
       // it's the first harvest, deduct rewards accumulated so far in legacy pool
       totalAssetsDelta -= SafeCast.toInt256(_rewardEthToken.totalRewards());
       // the first state update must be with positive delta
-      if (totalAssetsDelta < 0) revert Errors.NegativeAssetsDelta();
+      if (_poolEscrow.owner() != address(this) || totalAssetsDelta < 0) {
+        revert Errors.InvalidInitialHarvest();
+      }
     }
 
     // fetch total assets controlled by legacy pool
@@ -153,7 +155,9 @@ contract EthGenesisVault is Initializable, EthVault, IEthGenesisVault {
 
   /// @inheritdoc IEthGenesisVault
   function migrate(address receiver, uint256 assets) external override returns (uint256 shares) {
-    if (msg.sender != address(_rewardEthToken)) revert Errors.AccessDenied();
+    if (msg.sender != address(_rewardEthToken) || _poolEscrow.owner() != address(this)) {
+      revert Errors.AccessDenied();
+    }
 
     _checkCollateralized();
     _checkHarvested();
@@ -184,7 +188,7 @@ contract EthGenesisVault is Initializable, EthVault, IEthGenesisVault {
     address receiver,
     uint256 assets
   ) internal virtual override(VaultEnterExit, VaultEthStaking) {
-    _pullAssets();
+    if (assets > super._vaultAssets()) _pullAssets();
     return super._transferVaultAssets(receiver, assets);
   }
 

helpers/constants.ts

@@ -11,6 +11,7 @@ export const NETWORKS: {
     governor: '0xFF2B6d2d5c205b99E2e6f607B6aFA3127B9957B6',
     validatorsRegistry: '0xff50ed3d0ec03aC01D4C79aAd74928BFF48a7b2b',
     securityDeposit: 1000000000,
+    exitedAssetsClaimDelay: 24 * 60 * 60, // 24 hours
 
     // Keeper
     oracles: [
@@ -65,6 +66,7 @@ export const NETWORKS: {
     governor: '0x144a98cb1CdBb23610501fE6108858D9B7D24934',
     validatorsRegistry: '0x00000000219ab540356cBB839Cbe05303d7705Fa',
     securityDeposit: 1000000000,
+    exitedAssetsClaimDelay: 24 * 60 * 60, // 24 hours
 
     // Keeper
     oracles: [], // TODO: update with oracles' addresses

helpers/types.ts

@@ -13,6 +13,7 @@ export type NetworkConfig = {
   governor: string
   validatorsRegistry: string
   securityDeposit: BigNumberish
+  exitedAssetsClaimDelay: number
 
   // Keeper
   oracles: string[]

helpers/utils.ts

@@ -3,7 +3,7 @@ import { HardhatRuntimeEnvironment } from 'hardhat/types/runtime'
 
 export async function deployContract(tx: any): Promise<Contract> {
   const result = await tx
-  await result.deployTransaction.wait()
+  await result.waitForDeployment()
   return result
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stakewise/v3-core",
-  "version": "0.1.0",
+  "version": "1.0.0",
   "description": "Liquid staking protocol for Ethereum",
   "main": "index.js",
   "scripts": {

tasks/eth-full-deploy-local.ts

@@ -12,6 +12,7 @@ import {
   RewardSplitter__factory,
   RewardSplitterFactory__factory,
   CumulativeMerkleDrop__factory,
+  OsTokenChecker__factory,
 } from '../typechain-types'
 import { deployContract } from '../helpers/utils'
 import { NetworkConfig, Networks } from '../helpers/types'
@@ -55,15 +56,22 @@ task('eth-full-deploy-local', 'deploys StakeWise V3 for Ethereum to local networ
     const sharedMevEscrowAddress = await sharedMevEscrow.getAddress()
     console.log('SharedMevEscrow deployed at', sharedMevEscrowAddress)
 
+    const osTokenChecker = await deployContract(
+      new OsTokenChecker__factory(deployer).deploy(vaultsRegistryAddress)
+    )
+    const osTokenCheckerAddress = await osTokenChecker.getAddress()
+    console.log('OsTokenChecker deployed at', osTokenCheckerAddress)
+
     const keeperCalculatedAddress = ethers.getCreateAddress({
       from: deployer.address,
       nonce: (await ethers.provider.getTransactionCount(deployer.address)) + 1,
     })
     const osToken = await deployContract(
       new OsToken__factory(deployer).deploy(
         keeperCalculatedAddress,
-        vaultsRegistryAddress,
+        osTokenCheckerAddress,
         treasury.address,
+        governor.address,
         goerliConfig.osTokenFeePercent,
         goerliConfig.osTokenCapacity,
         goerliConfig.osTokenName,
@@ -107,7 +115,8 @@ task('eth-full-deploy-local', 'deploys StakeWise V3 for Ethereum to local networ
         ltvPercent: goerliConfig.ltvPercent,
       })
     )
-    console.log('OsTokenConfig deployed at', osTokenConfig.address)
+    const osTokenConfigAddress = await osTokenConfig.getAddress()
+    console.log('OsTokenConfig deployed at', osTokenConfigAddress)
 
     const factories: string[] = []
     for (const vaultType of ['EthVault', 'EthPrivVault', 'EthErc20Vault', 'EthPrivErc20Vault']) {
@@ -119,8 +128,9 @@ task('eth-full-deploy-local', 'deploys StakeWise V3 for Ethereum to local networ
           vaultsRegistryAddress,
           validatorsRegistryAddress,
           osTokenAddress,
-          osTokenConfig.address,
+          osTokenConfigAddress,
           sharedMevEscrowAddress,
+          goerliConfig.exitedAssetsClaimDelay,
         ],
       })) as string
       console.log(`${vaultType} implementation deployed at`, vaultImpl)
@@ -134,15 +144,16 @@ task('eth-full-deploy-local', 'deploys StakeWise V3 for Ethereum to local networ
       await vaultsRegistry.addFactory(ethVaultFactoryAddress)
       console.log(`Added ${vaultType}Factory to VaultsRegistry`)
 
-      await osToken.setVaultImplementation(vaultImpl, true)
-      console.log(`Added ${vaultType} implementation to OsToken`)
+      await vaultsRegistry.addVaultImpl(vaultImpl)
+      console.log(`Added ${vaultType} implementation to VaultsRegistry`)
       factories.push(ethVaultFactoryAddress)
     }
 
     const priceFeed = await deployContract(
       new PriceFeed__factory(deployer).deploy(osTokenAddress, goerliConfig.priceFeedDescription)
     )
-    console.log('PriceFeed deployed at', priceFeed.address)
+    const priceFeedAddress = await priceFeed.getAddress()
+    console.log('PriceFeed deployed at', priceFeedAddress)
 
     const rewardSplitterImpl = await deployContract(new RewardSplitter__factory(deployer).deploy())
     const rewardSplitterImplAddress = await rewardSplitterImpl.getAddress()
@@ -151,27 +162,30 @@ task('eth-full-deploy-local', 'deploys StakeWise V3 for Ethereum to local networ
     const rewardSplitterFactory = await deployContract(
       new RewardSplitterFactory__factory(deployer).deploy(rewardSplitterImplAddress)
     )
-    console.log('RewardSplitterFactory deployed at', rewardSplitterFactory.address)
+    const rewardSplitterFactoryAddress = await rewardSplitterFactory.getAddress()
+    console.log('RewardSplitterFactory deployed at', rewardSplitterFactoryAddress)
 
     const cumulativeMerkleDrop = await deployContract(
       new CumulativeMerkleDrop__factory(deployer).deploy(
         goerliConfig.liquidityCommittee,
         goerliConfig.swiseToken
       )
     )
-    console.log('CumulativeMerkleDrop deployed at', cumulativeMerkleDrop.address)
+    const cumulativeMerkleDropAddress = await cumulativeMerkleDrop.getAddress()
+    console.log('CumulativeMerkleDrop deployed at', cumulativeMerkleDropAddress)
 
     // pass ownership to governor
     await vaultsRegistry.transferOwnership(governor.address)
     await keeper.transferOwnership(governor.address)
     await osToken.transferOwnership(governor.address)
     console.log('Ownership transferred to governor')
 
-    // accept ownership from governor
-    await Keeper__factory.connect(keeperAddress, governor).acceptOwnership()
-    await OsToken__factory.connect(osTokenAddress, governor).acceptOwnership()
-    await VaultsRegistry__factory.connect(vaultsRegistryAddress, governor).acceptOwnership()
-    console.log('Ownership accepted from governor')
+    // transfer ownership to governor
+    await vaultsRegistry.initialize(governor.address)
+    console.log('VaultsRegistry ownership transferred to', governor.address)
+
+    await keeper.initialize(governor.address)
+    console.log('Keeper ownership transferred to', governor.address)
 
     // Save the addresses
     const addresses = {
@@ -183,9 +197,10 @@ task('eth-full-deploy-local', 'deploys StakeWise V3 for Ethereum to local networ
       EthPrivErc20VaultFactory: factories[3],
       SharedMevEscrow: sharedMevEscrowAddress,
       OsToken: osTokenAddress,
-      OsTokenConfig: osTokenConfig.address,
-      PriceFeed: priceFeed.address,
-      RewardSplitterFactory: rewardSplitterFactory.address,
+      OsTokenConfig: osTokenConfigAddress,
+      OsTokenChecker: osTokenCheckerAddress,
+      PriceFeed: priceFeedAddress,
+      RewardSplitterFactory: rewardSplitterFactoryAddress,
     }
     const json = JSON.stringify(addresses, null, 2)
     const fileName = `${DEPLOYMENTS_DIR}/${networkName}.json`