Skip to content

Commit 7b5d5e8

Browse files
committed
feat: make deposit lib internal
1 parent dda1e91 commit 7b5d5e8

File tree

2 files changed

+7
-26
lines changed

2 files changed

+7
-26
lines changed

contracts/0.8.25/lib/DepositLogistics.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ library DepositLogistics {
3939
bytes memory _pubkeys,
4040
bytes memory _sigs,
4141
bytes memory _sizes
42-
) external {
42+
) internal {
4343
if (_keyCount == 0) revert ZeroKeyCount();
4444
if (_pubkeys.length != PUBLIC_KEY_LENGTH * _keyCount) revert PubkeysLengthMismatch(_pubkeys.length, PUBLIC_KEY_LENGTH * _keyCount);
4545
if (_sigs.length != SIGNATURE_LENGTH * _keyCount) revert SignaturesLengthMismatch(_sigs.length, SIGNATURE_LENGTH * _keyCount);

test/0.8.25/vaults/staking-vault/staking-vault.test.ts

+6-25
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const MAX_INT128 = 2n ** 127n - 1n;
2323
const MAX_UINT128 = 2n ** 128n - 1n;
2424

2525
// @TODO: test reentrancy attacks
26-
describe("StakingVault", () => {
26+
describe.only("StakingVault", () => {
2727
let vaultOwner: HardhatEthersSigner;
2828
let operator: HardhatEthersSigner;
2929
let stranger: HardhatEthersSigner;
@@ -32,7 +32,6 @@ describe("StakingVault", () => {
3232
let vaultHubSigner: HardhatEthersSigner;
3333

3434
let stakingVault: StakingVault;
35-
let depositLogistics: DepositLogistics;
3635
let stakingVaultImplementation: StakingVault;
3736
let depositContract: DepositContract__MockForStakingVault;
3837
let vaultHub: VaultHub__MockForStakingVault;
@@ -50,7 +49,7 @@ describe("StakingVault", () => {
5049

5150
before(async () => {
5251
[vaultOwner, operator, elRewardsSender, stranger] = await ethers.getSigners();
53-
[stakingVault, vaultHub, vaultFactory, stakingVaultImplementation, depositContract, depositLogistics] =
52+
[stakingVault, vaultHub, vaultFactory, stakingVaultImplementation, depositContract] =
5453
await deployStakingVaultBehindBeaconProxy();
5554
ethRejector = await ethers.deployContract("EthRejector");
5655

@@ -84,25 +83,13 @@ describe("StakingVault", () => {
8483
});
8584

8685
it("reverts on construction if the vault hub address is zero", async () => {
87-
await expect(
88-
ethers.deployContract("StakingVault", [ZeroAddress, depositContractAddress], {
89-
libraries: {
90-
DepositLogistics: depositLogistics,
91-
},
92-
}),
93-
)
86+
await expect(ethers.deployContract("StakingVault", [ZeroAddress, depositContractAddress]))
9487
.to.be.revertedWithCustomError(stakingVaultImplementation, "ZeroArgument")
9588
.withArgs("_vaultHub");
9689
});
9790

9891
it("reverts on construction if the deposit contract address is zero", async () => {
99-
await expect(
100-
ethers.deployContract("StakingVault", [vaultHubAddress, ZeroAddress], {
101-
libraries: {
102-
DepositLogistics: depositLogistics,
103-
},
104-
}),
105-
)
92+
await expect(ethers.deployContract("StakingVault", [vaultHubAddress, ZeroAddress]))
10693
.to.be.revertedWithCustomError(stakingVaultImplementation, "ZeroArgument")
10794
.withArgs("_beaconChainDepositContract");
10895
});
@@ -479,18 +466,12 @@ describe("StakingVault", () => {
479466
VaultFactory__MockForStakingVault,
480467
StakingVault,
481468
DepositContract__MockForStakingVault,
482-
DepositLogistics,
483469
]
484470
> {
485471
// deploying implementation
486472
const vaultHub_ = await ethers.deployContract("VaultHub__MockForStakingVault");
487473
const depositContract_ = await ethers.deployContract("DepositContract__MockForStakingVault");
488-
const depositLogistics = await ethers.deployContract("DepositLogistics");
489-
const stakingVaultImplementation_ = await ethers.deployContract("StakingVault", [vaultHub_, depositContract_], {
490-
libraries: {
491-
DepositLogistics: depositLogistics,
492-
},
493-
});
474+
const stakingVaultImplementation_ = await ethers.deployContract("StakingVault", [vaultHub_, depositContract_]);
494475

495476
// deploying factory/beacon
496477
const vaultFactory_ = await ethers.deployContract("VaultFactory__MockForStakingVault", [
@@ -509,7 +490,7 @@ describe("StakingVault", () => {
509490
const stakingVault_ = StakingVault__factory.connect(vaultCreatedEvent.args.vault, vaultOwner);
510491
expect(await stakingVault_.owner()).to.equal(await vaultOwner.getAddress());
511492

512-
return [stakingVault_, vaultHub_, vaultFactory_, stakingVaultImplementation_, depositContract_, depositLogistics];
493+
return [stakingVault_, vaultHub_, vaultFactory_, stakingVaultImplementation_, depositContract_];
513494
}
514495

515496
function computeDepositDataRoot(creds: string, pubkey: string, signature: string, size: string) {

0 commit comments

Comments
 (0)