Audit fixes

abi/IEthFoxVault.json

@@ -311,6 +311,25 @@
     "name": "Redeemed",
     "type": "event"
   },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "user",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "shares",
+        "type": "uint256"
+      }
+    ],
+    "name": "UserEjected",
+    "type": "event"
+  },
   {
     "anonymous": false,
     "inputs": [

contracts/interfaces/IEthFoxVault.sol

@@ -31,6 +31,13 @@ interface IEthFoxVault is
   IVaultBlocklist,
   IMulticall
 {
+  /**
+   * @notice Event emitted when a user is ejected from the Vault
+   * @param user The address of the user
+   * @param shares The amount of shares ejected
+   */
+  event UserEjected(address user, uint256 shares);
+
   /**
    * @dev Struct for initializing the EthFoxVault contract
    * @param admin The address of the Vault admin

contracts/vaults/ethereum/custom/EthFoxVault.sol

@@ -100,6 +100,7 @@ contract EthFoxVault is
       // redeem user shares
       _redeem(user, userShares, user);
     }
+    emit UserEjected(user, userShares);
   }
 
   /**

helpers/utils.ts

@@ -6,9 +6,10 @@ export async function deployContract(
   hre: HardhatRuntimeEnvironment,
   contractName: string,
   constructorArgs: any[],
-  path?: string
+  path?: string,
+  options?: any
 ): Promise<Contract> {
-  const contract = await hre.ethers.deployContract(contractName, constructorArgs)
+  const contract = await hre.ethers.deployContract(contractName, constructorArgs, options)
   await contract.waitForDeployment()
 
   const contractAddress = await contract.getAddress()

tasks/eth-full-deploy-local.ts

@@ -211,34 +211,44 @@ task('eth-full-deploy-local', 'deploys StakeWise V3 for Ethereum to local networ
     const foxVaultFactory = await ethers.getContractFactory('EthFoxVault')
     await simulateDeployImpl(hre, foxVaultFactory, { constructorArgs }, foxVaultImplAddress)
 
-    // Deploy EthFoxVault proxy
-    proxy = await deployContract(hre, 'ERC1967Proxy', [foxVaultImplAddress, '0x'])
-    const foxVaultAddress = await proxy.getAddress()
-    const foxVault = foxVaultFactory.attach(foxVaultAddress)
+    const foxVaultAddress = ethers.getCreateAddress({
+      from: deployer.address,
+      nonce: (await ethers.provider.getTransactionCount(deployer.address)) + 1,
+    })
 
-    // Initialize EthFoxVault
+    // Deploy ownMevEscrow for EthFoxVault
     const ownMevEscrowFactory = await ethers.getContractFactory('OwnMevEscrow')
     const ownMevEscrow = await ownMevEscrowFactory.deploy(foxVaultAddress)
-    await callContract(
-      foxVault.initialize(
-        ethers.AbiCoder.defaultAbiCoder().encode(
-          [
-            'tuple(address admin, address ownMevEscrow, uint256 capacity, uint16 feePercent, string metadataIpfsHash)',
-          ],
-          [
-            [
-              networkConfig.foxVault.admin,
-              await ownMevEscrow.getAddress(),
-              networkConfig.foxVault.capacity,
-              networkConfig.foxVault.feePercent,
-              networkConfig.foxVault.metadataIpfsHash,
-            ],
-          ]
-        ),
-        { value: networkConfig.securityDeposit }
-      )
+
+    // Deploy EthFoxVault proxy
+    const initCall = ethers.AbiCoder.defaultAbiCoder().encode(
+      [
+        'tuple(address admin, address ownMevEscrow, uint256 capacity, uint16 feePercent, string metadataIpfsHash)',
+      ],
+      [
+        [
+          networkConfig.foxVault.admin,
+          await ownMevEscrow.getAddress(),
+          networkConfig.foxVault.capacity,
+          networkConfig.foxVault.feePercent,
+          networkConfig.foxVault.metadataIpfsHash,
+        ],
+      ]
     )
 
+    proxy = await deployContract(
+      hre,
+      'ERC1967Proxy',
+      [foxVaultImplAddress, foxVaultFactory.interface.encodeFunctionData('initialize', [initCall])],
+      undefined,
+      {
+        value: networkConfig.securityDeposit,
+      }
+    )
+    if ((await proxy.getAddress()) !== foxVaultAddress) {
+      throw new Error('EthFoxVault address mismatch')
+    }
+
     await callContract(vaultsRegistry.addVault(foxVaultAddress))
     console.log('Added EthFoxVault to VaultsRegistry')
 

tasks/eth-full-deploy.ts

@@ -244,39 +244,45 @@ task('eth-full-deploy', 'deploys StakeWise V3 for Ethereum').setAction(async (ta
   const foxVaultFactory = await ethers.getContractFactory('EthFoxVault')
   await simulateDeployImpl(hre, foxVaultFactory, { constructorArgs }, foxVaultImplAddress)
 
-  // Deploy EthFoxVault proxy
-  proxy = await deployContract(
-    hre,
-    'ERC1967Proxy',
-    [foxVaultImplAddress, '0x'],
-    '@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol:ERC1967Proxy'
-  )
-  const foxVaultAddress = await proxy.getAddress()
-  const foxVault = foxVaultFactory.attach(foxVaultAddress)
+  // calculate EthFoxVault address
+  const foxVaultAddress = ethers.getCreateAddress({
+    from: deployer.address,
+    nonce: (await ethers.provider.getTransactionCount(deployer.address)) + 1,
+  })
 
-  // Initialize EthFoxVault
+  // Deploy OwnMevEscrow for EthFoxVault
   const ownMevEscrowFactory = await ethers.getContractFactory('OwnMevEscrow')
   const ownMevEscrow = await ownMevEscrowFactory.deploy(foxVaultAddress)
-  await callContract(
-    foxVault.initialize(
-      ethers.AbiCoder.defaultAbiCoder().encode(
-        [
-          'tuple(address admin, address ownMevEscrow, uint256 capacity, uint16 feePercent, string metadataIpfsHash)',
-        ],
-        [
-          [
-            networkConfig.foxVault.admin,
-            await ownMevEscrow.getAddress(),
-            networkConfig.foxVault.capacity,
-            networkConfig.foxVault.feePercent,
-            networkConfig.foxVault.metadataIpfsHash,
-          ],
-        ]
-      ),
-      { value: networkConfig.securityDeposit }
-    )
+
+  // Deploy and initialize EthFoxVault proxy
+  const initCall = ethers.AbiCoder.defaultAbiCoder().encode(
+    [
+      'tuple(address admin, address ownMevEscrow, uint256 capacity, uint16 feePercent, string metadataIpfsHash)',
+    ],
+    [
+      [
+        networkConfig.foxVault.admin,
+        await ownMevEscrow.getAddress(),
+        networkConfig.foxVault.capacity,
+        networkConfig.foxVault.feePercent,
+        networkConfig.foxVault.metadataIpfsHash,
+      ],
+    ]
   )
 
+  proxy = await deployContract(
+    hre,
+    'ERC1967Proxy',
+    [foxVaultImplAddress, foxVaultFactory.interface.encodeFunctionData('initialize', [initCall])],
+    '@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol:ERC1967Proxy',
+    {
+      value: networkConfig.securityDeposit,
+    }
+  )
+  if ((await proxy.getAddress()) !== foxVaultAddress) {
+    throw new Error('EthFoxVault address mismatch')
+  }
+
   await callContract(vaultsRegistry.addVault(foxVaultAddress))
   console.log('Added EthFoxVault to VaultsRegistry')
 

test/EthFoxVault.spec.ts

@@ -229,6 +229,7 @@ describe('EthFoxVault', () => {
       await expect(tx)
         .to.emit(vault, 'Redeemed')
         .withArgs(sender.address, sender.address, senderAssets, senderShares)
+      await expect(tx).to.emit(vault, 'UserEjected').withArgs(sender.address, senderShares)
       expect(await vault.getShares(sender.address)).to.eq(0)
       await snapshotGasCost(tx)
     })
@@ -245,6 +246,7 @@ describe('EthFoxVault', () => {
       await expect(tx)
         .to.emit(vault, 'ExitQueueEntered')
         .withArgs(sender.address, sender.address, positionTicket, senderShares)
+      await expect(tx).to.emit(vault, 'UserEjected').withArgs(sender.address, senderShares)
       expect(await vault.getShares(sender.address)).to.eq(0)
       await snapshotGasCost(tx)
     })

test/__snapshots__/EthFoxVault.spec.ts.snap

@@ -31,21 +31,21 @@ Object {
 exports[`EthFoxVault ejecting user blocklist manager can eject all of the user assets for collateralized vault 1`] = `
 Object {
   "calldataByteLength": 36,
-  "gasUsed": 112108,
+  "gasUsed": 113416,
 }
 `;
 
 exports[`EthFoxVault ejecting user blocklist manager can eject all of the user assets for not collateralized vault 1`] = `
 Object {
   "calldataByteLength": 36,
-  "gasUsed": 83278,
+  "gasUsed": 84597,
 }
 `;
 
 exports[`EthFoxVault ejecting user does not fail for user with no vault shares 1`] = `
 Object {
   "calldataByteLength": 36,
-  "gasUsed": 55808,
+  "gasUsed": 55813,
 }
 `;