Skip to content

Commit

Permalink
fix: types
Browse files Browse the repository at this point in the history
  • Loading branch information
failingtwice committed Jan 28, 2025
1 parent 6f8bd86 commit 199d078
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
5 changes: 2 additions & 3 deletions lib/proxy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ import {
StakingVault,
VaultFactory,
} from "typechain-types";
import { DelegationConfigStruct } from "typechain-types/contracts/0.8.25/vaults/VaultFactory";

import { findEventsWithInterfaces } from "lib";

import { IDelegation } from "../typechain-types/contracts/0.8.25/vaults/VaultFactory.sol/VaultFactory";

interface ProxifyArgs<T> {
impl: T;
admin: HardhatEthersSigner;
Expand Down Expand Up @@ -49,7 +48,7 @@ interface CreateVaultResponse {
export async function createVaultProxy(
caller: HardhatEthersSigner,
vaultFactory: VaultFactory,
delegationParams: IDelegation.InitialStateStruct,
delegationParams: DelegationConfigStruct,
stakingVaultInitializerExtraParams: BytesLike = "0x",
): Promise<CreateVaultResponse> {
const tx = await vaultFactory
Expand Down
11 changes: 7 additions & 4 deletions test/0.8.25/vaults/dashboard/dashboard.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,16 @@ describe.skip("Dashboard.sol", () => {

context("initialize", () => {
it("reverts if already initialized", async () => {
await expect(dashboard.initialize()).to.be.revertedWithCustomError(dashboard, "AlreadyInitialized");
await expect(dashboard.initialize(vaultOwner)).to.be.revertedWithCustomError(dashboard, "AlreadyInitialized");
});

it("reverts if called on the implementation", async () => {
const dashboard_ = await ethers.deployContract("Dashboard", [steth, weth, wsteth]);

await expect(dashboard_.initialize()).to.be.revertedWithCustomError(dashboard_, "NonProxyCallsForbidden");
await expect(dashboard_.initialize(vaultOwner)).to.be.revertedWithCustomError(
dashboard_,
"NonProxyCallsForbidden",
);
});
});

Expand Down Expand Up @@ -438,14 +441,14 @@ describe.skip("Dashboard.sol", () => {

context("transferStVaultOwnership", () => {
it("reverts if called by a non-admin", async () => {
await expect(dashboard.connect(stranger).transferStVaultOwnership(vaultOwner))
await expect(dashboard.connect(stranger).transferStakingVaultOwnership(vaultOwner))
.to.be.revertedWithCustomError(dashboard, "AccessControlUnauthorizedAccount")
.withArgs(stranger, await dashboard.DEFAULT_ADMIN_ROLE());
});

it("assigns a new owner to the staking vault", async () => {
const newOwner = certainAddress("dashboard:test:new-owner");
await expect(dashboard.transferStVaultOwnership(newOwner))
await expect(dashboard.transferStakingVaultOwnership(newOwner))
.to.emit(vault, "OwnershipTransferred")
.withArgs(dashboard, newOwner);
expect(await vault.owner()).to.equal(newOwner);
Expand Down

0 comments on commit 199d078

Please sign in to comment.