Merge branch 'feat/withdrawal-credentials' into feat/vaults-triggerab…

…le-exits
lidofinance · Feb 4, 2025 · c9d3226 · c9d3226
2 parents 1b11c66 + c27de34
commit c9d3226
Show file tree

Hide file tree

Showing 8 changed files with 74 additions and 12 deletions.
diff --git a/contracts/common/lib/TriggerableWithdrawals.sol b/contracts/common/lib/TriggerableWithdrawals.sol
@@ -10,13 +10,14 @@ pragma solidity >=0.8.9 <0.9.0;
  * Allow validators to trigger withdrawals and exits from their execution layer (0x01) withdrawal credentials.
  */
 library TriggerableWithdrawals {
-    address constant WITHDRAWAL_REQUEST = 0x0c15F14308530b7CDB8460094BbB9cC28b9AaaAA;
+    address constant WITHDRAWAL_REQUEST = 0x00000961Ef480Eb55e80D19ad83579A64c007002;
 
     uint256 internal constant PUBLIC_KEY_LENGTH = 48;
     uint256 internal constant WITHDRAWAL_AMOUNT_LENGTH = 8;
     uint256 internal constant WITHDRAWAL_REQUEST_CALLDATA_LENGTH = 56;
 
     error WithdrawalFeeReadFailed();
+    error WithdrawalFeeInvalidData();
     error WithdrawalRequestAdditionFailed(bytes callData);
 
     error InsufficientWithdrawalFee(uint256 feePerRequest, uint256 minFeePerRequest);
@@ -156,6 +157,10 @@ library TriggerableWithdrawals {
             revert WithdrawalFeeReadFailed();
         }
 
+        if (feeData.length != 32) {
+            revert WithdrawalFeeInvalidData();
+        }
+
         return abi.decode(feeData, (uint256));
     }
 

diff --git a/test/0.8.25/vaults/staking-vault/stakingVault.test.ts b/test/0.8.25/vaults/staking-vault/stakingVault.test.ts
@@ -621,7 +621,7 @@ describe("StakingVault.sol", () => {
     });
 
     it("makes a full validator withdrawal when called by the node operator", async () => {
-      const fee = await withdrawalRequest.fee();
+      const fee = BigInt(await withdrawalRequest.fee());
       const amount = ether("32");
 
       await expect(stakingVault.connect(operator).initiateFullValidatorWithdrawal(SAMPLE_PUBKEY, { value: amount }))
@@ -652,8 +652,8 @@ describe("StakingVault.sol", () => {
     });
 
     it("makes a partial validator withdrawal when called by the owner", async () => {
+      const fee = BigInt(await withdrawalRequest.fee());
       const amount = ether("32");
-      const fee = await withdrawalRequest.fee();
 
       await expect(
         stakingVault
@@ -667,8 +667,8 @@ describe("StakingVault.sol", () => {
     });
 
     it("makes a partial validator withdrawal when called by the node operator", async () => {
+      const fee = BigInt(await withdrawalRequest.fee());
       const amount = ether("32");
-      const fee = await withdrawalRequest.fee();
 
       await expect(
         stakingVault

diff --git a/test/0.8.9/withdrawalVault.test.ts b/test/0.8.9/withdrawalVault.test.ts
@@ -284,6 +284,14 @@ describe("WithdrawalVault.sol", () => {
       await withdrawalsPredeployed.setFailOnGetFee(true);
       await expect(vault.getWithdrawalRequestFee()).to.be.revertedWithCustomError(vault, "WithdrawalFeeReadFailed");
     });
+
+    ["0x", "0x01", "0x" + "0".repeat(61) + "1", "0x" + "0".repeat(65) + "1"].forEach((unexpectedFee) => {
+      it(`Shoud revert if unexpected fee value ${unexpectedFee} is returned`, async function () {
+        await withdrawalsPredeployed.setFeeRaw(unexpectedFee);
+
+        await expect(vault.getWithdrawalRequestFee()).to.be.revertedWithCustomError(vault, "WithdrawalFeeInvalidData");
+      });
+    });
   });
 
   async function getFee(): Promise<bigint> {
@@ -387,6 +395,19 @@ describe("WithdrawalVault.sol", () => {
       ).to.be.revertedWithCustomError(vault, "WithdrawalFeeReadFailed");
     });
 
+    ["0x", "0x01", "0x" + "0".repeat(61) + "1", "0x" + "0".repeat(65) + "1"].forEach((unexpectedFee) => {
+      it(`Shoud revert if unexpected fee value ${unexpectedFee} is returned`, async function () {
+        await withdrawalsPredeployed.setFeeRaw(unexpectedFee);
+
+        const { pubkeysHexString } = generateWithdrawalRequestPayload(2);
+        const fee = 10n;
+
+        await expect(
+          vault.connect(validatorsExitBus).addFullWithdrawalRequests(pubkeysHexString, { value: fee }),
+        ).to.be.revertedWithCustomError(vault, "WithdrawalFeeInvalidData");
+      });
+    });
+
     it("should revert if refund failed", async function () {
       const refundFailureTester: RefundFailureTester = await ethers.deployContract("RefundFailureTester", [
         vaultAddress,

diff --git a/test/common/contracts/EIP7002WithdrawalRequest_Mock.sol b/test/common/contracts/EIP7002WithdrawalRequest_Mock.sol
@@ -7,7 +7,7 @@ pragma solidity 0.8.9;
  * @notice This is a mock of EIP-7002's pre-deploy contract.
  */
 contract EIP7002WithdrawalRequest_Mock {
-    uint256 public fee;
+    bytes public fee;
     bool public failOnAddRequest;
     bool public failOnGetFee;
 
@@ -23,15 +23,18 @@ contract EIP7002WithdrawalRequest_Mock {
 
     function setFee(uint256 _fee) external {
         require(_fee > 0, "fee must be greater than 0");
-        fee = _fee;
+        fee = abi.encode(_fee);
     }
 
-    fallback(bytes calldata input) external payable returns (bytes memory output) {
+    function setFeeRaw(bytes calldata _rawFeeBytes) external {
+        fee = _rawFeeBytes;
+    }
+
+    fallback(bytes calldata input) external payable returns (bytes memory) {
         if (input.length == 0) {
             require(!failOnGetFee, "fail on get fee");
 
-            output = abi.encode(fee);
-            return output;
+            return fee;
         }
 
         require(!failOnAddRequest, "fail on add request");

diff --git a/test/common/lib/triggerableWithdrawals/triggerableWithdrawals.test.ts b/test/common/lib/triggerableWithdrawals/triggerableWithdrawals.test.ts
@@ -81,6 +81,17 @@ describe("TriggerableWithdrawals.sol", () => {
         "WithdrawalFeeReadFailed",
       );
     });
+
+    ["0x", "0x01", "0x" + "0".repeat(61) + "1", "0x" + "0".repeat(65) + "1"].forEach((unexpectedFee) => {
+      it(`Shoud revert if unexpected fee value ${unexpectedFee} is returned`, async function () {
+        await withdrawalsPredeployed.setFeeRaw(unexpectedFee);
+
+        await expect(triggerableWithdrawals.getWithdrawalRequestFee()).to.be.revertedWithCustomError(
+          triggerableWithdrawals,
+          "WithdrawalFeeInvalidData",
+        );
+      });
+    });
   });
 
   context("add triggerable withdrawal requests", () => {
@@ -265,6 +276,28 @@ describe("TriggerableWithdrawals.sol", () => {
       ).to.be.revertedWithCustomError(triggerableWithdrawals, "WithdrawalFeeReadFailed");
     });
 
+    ["0x", "0x01", "0x" + "0".repeat(61) + "1", "0x" + "0".repeat(65) + "1"].forEach((unexpectedFee) => {
+      it(`Shoud revert if unexpected fee value ${unexpectedFee} is returned`, async function () {
+        await withdrawalsPredeployed.setFeeRaw(unexpectedFee);
+
+        const { pubkeysHexString, partialWithdrawalAmounts, mixedWithdrawalAmounts } =
+          generateWithdrawalRequestPayload(2);
+        const fee = 10n;
+
+        await expect(
+          triggerableWithdrawals.addFullWithdrawalRequests(pubkeysHexString, fee),
+        ).to.be.revertedWithCustomError(triggerableWithdrawals, "WithdrawalFeeInvalidData");
+
+        await expect(
+          triggerableWithdrawals.addPartialWithdrawalRequests(pubkeysHexString, partialWithdrawalAmounts, fee),
+        ).to.be.revertedWithCustomError(triggerableWithdrawals, "WithdrawalFeeInvalidData");
+
+        await expect(
+          triggerableWithdrawals.addWithdrawalRequests(pubkeysHexString, mixedWithdrawalAmounts, fee),
+        ).to.be.revertedWithCustomError(triggerableWithdrawals, "WithdrawalFeeInvalidData");
+      });
+    });
+
     it("Should accept withdrawal requests with minimal possible fee when fee not provided", async function () {
       const requestCount = 3;
       const { pubkeysHexString, pubkeys, fullWithdrawalAmounts, partialWithdrawalAmounts, mixedWithdrawalAmounts } =

diff --git a/test/common/lib/triggerableWithdrawals/utils.ts b/test/common/lib/triggerableWithdrawals/utils.ts
@@ -2,7 +2,7 @@ import { ethers } from "hardhat";
 
 import { EIP7002WithdrawalRequest_Mock } from "typechain-types";
 
-export const withdrawalsPredeployedHardcodedAddress = "0x0c15F14308530b7CDB8460094BbB9cC28b9AaaAA";
+export const withdrawalsPredeployedHardcodedAddress = "0x00000961Ef480Eb55e80D19ad83579A64c007002";
 
 export async function deployWithdrawalsPredeployedMock(
   defaultRequestFee: bigint,

diff --git a/test/deploy/stakingVault.ts b/test/deploy/stakingVault.ts
@@ -44,7 +44,7 @@ export async function deployStakingVaultBehindBeaconProxy(
   vaultOwner: HardhatEthersSigner,
   operator: HardhatEthersSigner,
 ): Promise<DeployedStakingVault> {
-  // ERC7002 pre-deployed contract mock (0x0c15F14308530b7CDB8460094BbB9cC28b9AaaAA)
+  // ERC7002 pre-deployed contract mock (0x00000961Ef480Eb55e80D19ad83579A64c007002)
   await deployWithdrawalsPreDeployedMock(1n);
 
   // deploying implementation

diff --git a/test/suite/constants.ts b/test/suite/constants.ts
@@ -10,4 +10,4 @@ export const SHARE_RATE_PRECISION = BigInt(10 ** 27);
 
 export const ZERO_HASH = new Uint8Array(32).fill(0);
 
-export const EIP7002_PREDEPLOYED_ADDRESS = "0x0c15F14308530b7CDB8460094BbB9cC28b9AaaAA";
+export const EIP7002_PREDEPLOYED_ADDRESS = "0x00000961Ef480Eb55e80D19ad83579A64c007002";
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,4 +10,4 @@ export const SHARE_RATE_PRECISION = BigInt(10 ** 27);

		export const ZERO_HASH = new Uint8Array(32).fill(0);

		export const EIP7002_PREDEPLOYED_ADDRESS = "0x0c15F14308530b7CDB8460094BbB9cC28b9AaaAA";
		export const EIP7002_PREDEPLOYED_ADDRESS = "0x00000961Ef480Eb55e80D19ad83579A64c007002";