From e8d687702064df86134d03abbdca29a03db32ac1 Mon Sep 17 00:00:00 2001 From: xhad Date: Sat, 19 Oct 2024 01:00:26 +0800 Subject: [PATCH] run forge fmt --- script/Deploy.s.sol | 4 +--- src/SingleVault.sol | 36 +++++++++------------------------ src/VaultFactory.sol | 20 +++++++++--------- src/interface/ISingleVault.sol | 9 ++------- src/interface/IVaultFactory.sol | 9 +++------ test/factory/create.t.sol | 1 - test/helpers/Assets.sol | 1 - test/helpers/Setup.sol | 7 +------ test/single/unit/deposit.t.sol | 6 +----- test/single/unit/invariants.sol | 2 +- test/single/unit/withdraw.t.sol | 2 +- 11 files changed, 29 insertions(+), 68 deletions(-) diff --git a/script/Deploy.s.sol b/script/Deploy.s.sol index 06db436..c3f6a7d 100644 --- a/script/Deploy.s.sol +++ b/script/Deploy.s.sol @@ -6,14 +6,12 @@ import "lib/forge-std/src/Script.sol"; import {VaultFactory} from "src/VaultFactory.sol"; import {IVaultFactory} from "src/interface/IVaultFactory.sol"; import {IActors, MainnetActors, HoleskyActors} from "script/Actors.sol"; -import {MainnetContracts,HoleskyContracts} from "script/Contracts.sol"; +import {MainnetContracts, HoleskyContracts} from "script/Contracts.sol"; import {SingleVault} from "src/SingleVault.sol"; import {TransparentUpgradeableProxy, TimelockController} from "src/Common.sol"; contract DeployVaultFactory is Script { - function run() public { - if (block.chainid == 17000) { vm.startBroadcast(); HoleskyActors actors = new HoleskyActors(); diff --git a/src/SingleVault.sol b/src/SingleVault.sol index 601945a..ad061c2 100644 --- a/src/SingleVault.sol +++ b/src/SingleVault.sol @@ -1,35 +1,20 @@ // SPDX-License-Identifier: BSD-3-Clause pragma solidity ^0.8.24; -import { - ERC4626Upgradeable, - AccessControlUpgradeable, - ReentrancyGuardUpgradeable, - IERC20, - Math -} from "src/Common.sol"; +import {ERC4626Upgradeable, AccessControlUpgradeable, ReentrancyGuardUpgradeable, IERC20, Math} from "src/Common.sol"; import {ISingleVault} from "src/interface/ISingleVault.sol"; /* ynETH Pre-Launch Vault */ -contract SingleVault is ISingleVault, - ERC4626Upgradeable, - AccessControlUpgradeable, - ReentrancyGuardUpgradeable -{ +contract SingleVault is ISingleVault, ERC4626Upgradeable, AccessControlUpgradeable, ReentrancyGuardUpgradeable { using Math for uint256; constructor() { _disableInitializers(); } - function initialize( - IERC20 asset_, - string memory name_, - string memory symbol_, - address admin_ - ) public initializer { + function initialize(IERC20 asset_, string memory name_, string memory symbol_, address admin_) public initializer { _verifyParamsAreValid(asset_, name_, symbol_, admin_); __ERC20_init(name_, symbol_); __ERC4626_init(asset_); @@ -38,20 +23,19 @@ contract SingleVault is ISingleVault, _grantRole(DEFAULT_ADMIN_ROLE, admin_); } - receive() external payable nonReentrant() { + receive() external payable nonReentrant { if (msg.value > 0) { _mintSharesForETH(msg.value); } } - fallback() external payable nonReentrant() { + fallback() external payable nonReentrant { if (msg.value > 0) { _mintSharesForETH(msg.value); } } function _mintSharesForETH(uint256 amount) private { - IERC20 weth = _retrieveERC4626Storage()._asset; (bool success,) = address(weth).call{value: amount}(""); @@ -62,12 +46,10 @@ contract SingleVault is ISingleVault, } } - function _verifyParamsAreValid( - IERC20 asset_, - string memory name_, - string memory symbol_, - address admin_ - ) internal pure { + function _verifyParamsAreValid(IERC20 asset_, string memory name_, string memory symbol_, address admin_) + internal + pure + { if (asset_ == IERC20(address(0))) revert AssetZeroAddress(); if (bytes(name_).length == 0) revert NameEmpty(); if (bytes(symbol_).length == 0) revert SymbolEmpty(); diff --git a/src/VaultFactory.sol b/src/VaultFactory.sol index 26b955c..dbfb4ca 100644 --- a/src/VaultFactory.sol +++ b/src/VaultFactory.sol @@ -32,7 +32,10 @@ contract VaultFactory is IVaultFactory, AccessControlUpgradeable { * @param admin The address of the administrator. * @param timelock_ The Vault admin for proxy upgrades */ - function initialize(address singleVaultImpl_, address admin, address timelock_, address weth_) external initializer { + function initialize(address singleVaultImpl_, address admin, address timelock_, address weth_) + external + initializer + { _grantRole(DEFAULT_ADMIN_ROLE, admin); // NOTES: There are two timelocks. This timelock is for vault upgrades but // the vault is the second timelock controller, which has the same proposers and executors @@ -50,20 +53,17 @@ contract VaultFactory is IVaultFactory, AccessControlUpgradeable { * @param admin_ The address of the timelock. * @return address The address of the newly created vault. */ - function createSingleVault( - IERC20 asset_, - string memory name_, - string memory symbol_, - address admin_ - ) public onlyRole(DEFAULT_ADMIN_ROLE) returns (address) { + function createSingleVault(IERC20 asset_, string memory name_, string memory symbol_, address admin_) + public + onlyRole(DEFAULT_ADMIN_ROLE) + returns (address) + { string memory funcSig = "initialize(address,string,string,address)"; if (address(asset_) != address(weth)) revert InvalidWethAddress(); TransparentUpgradeableProxy proxy = new TransparentUpgradeableProxy( - singleVaultImpl, - timelock, - abi.encodeWithSignature(funcSig, asset_, name_, symbol_, admin_) + singleVaultImpl, timelock, abi.encodeWithSignature(funcSig, asset_, name_, symbol_, admin_) ); // bootstrap 1 ether of weth to prevent donation attacks diff --git a/src/interface/ISingleVault.sol b/src/interface/ISingleVault.sol index 1353759..db040e8 100644 --- a/src/interface/ISingleVault.sol +++ b/src/interface/ISingleVault.sol @@ -9,11 +9,6 @@ interface ISingleVault is IERC20, IERC4626, IAccessControl { error SymbolEmpty(); error AdminZeroAddress(); error DepositFailed(); - - function initialize( - IERC20 asset_, - string calldata name_, - string calldata symbol_, - address admin_ - ) external; + + function initialize(IERC20 asset_, string calldata name_, string calldata symbol_, address admin_) external; } diff --git a/src/interface/IVaultFactory.sol b/src/interface/IVaultFactory.sol index 7f24e38..8dfa5cb 100644 --- a/src/interface/IVaultFactory.sol +++ b/src/interface/IVaultFactory.sol @@ -15,10 +15,7 @@ interface IVaultFactory is IAccessControl { function initialize(address singleVaultImpl_, address admin, address timelock_, address weth_) external; - function createSingleVault( - IERC20 asset_, - string memory name_, - string memory symbol_, - address admin_ - ) external returns (address); + function createSingleVault(IERC20 asset_, string memory name_, string memory symbol_, address admin_) + external + returns (address); } diff --git a/test/factory/create.t.sol b/test/factory/create.t.sol index 9b6db3a..88c49b3 100644 --- a/test/factory/create.t.sol +++ b/test/factory/create.t.sol @@ -28,7 +28,6 @@ contract CreateTest is Test, LocalActors, TestConstants { Etches etches = new Etches(); etches.mockWETH9(); - proposers = [PROPOSER_1]; executors = [EXECUTOR_1]; diff --git a/test/helpers/Assets.sol b/test/helpers/Assets.sol index 7bcdd5b..69a5ff2 100644 --- a/test/helpers/Assets.sol +++ b/test/helpers/Assets.sol @@ -8,7 +8,6 @@ import {MainnetContracts} from "script/Contracts.sol"; import "forge-std/Test.sol"; contract AssetHelper is Test { - function get_weth(address user, uint256 amount) public { IWETH weth = IWETH(payable(MainnetContracts.WETH)); deal(address(this), amount); diff --git a/test/helpers/Setup.sol b/test/helpers/Setup.sol index 2342187..c670f34 100644 --- a/test/helpers/Setup.sol +++ b/test/helpers/Setup.sol @@ -26,12 +26,7 @@ contract SetupHelper is Test, LocalActors, TestConstants { IWETH(payable(MainnetContracts.WETH)).deposit{value: 1 ether}(); IERC20(MainnetContracts.WETH).transfer(address(factory), 1 ether); - address vaultAddress = factory.createSingleVault( - IERC20(MainnetContracts.WETH), - VAULT_NAME, - VAULT_SYMBOL, - ADMIN - ); + address vaultAddress = factory.createSingleVault(IERC20(MainnetContracts.WETH), VAULT_NAME, VAULT_SYMBOL, ADMIN); vault = SingleVault(payable(vaultAddress)); vm.stopPrank(); } diff --git a/test/single/unit/deposit.t.sol b/test/single/unit/deposit.t.sol index 9e8a696..fff3b37 100644 --- a/test/single/unit/deposit.t.sol +++ b/test/single/unit/deposit.t.sol @@ -42,11 +42,7 @@ contract DepositTest is Test, LocalActors, TestConstants { assertEq(shares, previewAmount, "Shares should be equal to the amount deposited"); assertEq(vault.balanceOf(USER), shares, "Balance of the user should be updated"); assertEq(asset.balanceOf(address(vault)), amount + 1 ether, "Vault should have received the asset"); - assertEq( - vault.totalAssets(), - amount + 1 ether, - "Vault totalAsset should be amount deposited" - ); + assertEq(vault.totalAssets(), amount + 1 ether, "Vault totalAsset should be amount deposited"); assertEq(vault.totalSupply(), totalShares, "Vault totalSupply should be amount deposited"); } diff --git a/test/single/unit/invariants.sol b/test/single/unit/invariants.sol index 4a91f9f..31f2f7a 100644 --- a/test/single/unit/invariants.sol +++ b/test/single/unit/invariants.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.24; import {SingleVault} from "src/SingleVault.sol"; import {WETH9} from "test/mocks/MockWETH.sol"; -import {Math,IERC20} from "src/Common.sol"; +import {Math, IERC20} from "src/Common.sol"; import {SetupHelper} from "test/helpers/Setup.sol"; import {Etches} from "test/helpers/Etches.sol"; import {TestConstants} from "test/helpers/Constants.sol"; diff --git a/test/single/unit/withdraw.t.sol b/test/single/unit/withdraw.t.sol index 7e43864..c10dd7d 100644 --- a/test/single/unit/withdraw.t.sol +++ b/test/single/unit/withdraw.t.sol @@ -32,7 +32,7 @@ contract WithdrawTest is Test, LocalActors, TestConstants { address USER = address(33); vm.startPrank(USER); uint256 amount = 100 * 10 ** 18; - deal(USER,amount); + deal(USER, amount); asset.deposit{value: amount}(); asset.approve(address(vault), amount);