Skip to content

fix(getFee): unintentional target address variability #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guptaharsh13 merged 1 commit into from
May 6, 2025
Merged

fix(getFee): unintentional target address variability #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions src/Pectra.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,14 @@ contract Pectra {
_;
}

function getFee(address target) public view returns (uint256 fee) {
(bool readOK, bytes memory feeData) = target.staticcall("");
function getConsolidationFee() public view returns (uint256 fee) {
(bool readOK, bytes memory feeData) = consolidationTarget.staticcall("");
if (!readOK) return MIN_FEE;
fee = uint256(bytes32(feeData));
}

function getExitFee() public view returns (uint256 fee) {
(bool readOK, bytes memory feeData) = exitTarget.staticcall("");
if (!readOK) return MIN_FEE;
fee = uint256(bytes32(feeData));
}
Expand All @@ -82,7 +88,7 @@ contract Pectra {
revert InvalidTargetPubkeyLength(targetPubkey);
}

uint256 consolidationFee = getFee(consolidationTarget);
uint256 consolidationFee = getConsolidationFee();
require(msg.value >= batchSize * consolidationFee, InsufficientFeePerValidator());

for (uint256 i = 0; i < batchSize; ++i) {
Expand All @@ -105,7 +111,7 @@ contract Pectra {
require(batchSize >= MIN_VALIDATORS, MinimumValidatorRequired());
require(batchSize <= MAX_VALIDATORS, TooManyValidators());

uint256 switchFee = getFee(consolidationTarget);
uint256 switchFee = getConsolidationFee();
require(msg.value >= batchSize * switchFee, InsufficientFeePerValidator());

for (uint256 i = 0; i < batchSize; ++i) {
Expand All @@ -128,7 +134,7 @@ contract Pectra {
require(batchSize >= MIN_VALIDATORS, MinimumValidatorRequired());
require(batchSize <= MAX_VALIDATORS, TooManyValidators());

uint256 exitFee = getFee(exitTarget);
uint256 exitFee = getExitFee();
require(msg.value >= batchSize * exitFee, InsufficientFeePerValidator());

for (uint256 i = 0; i < batchSize; ++i) {
Expand Down
20 changes: 10 additions & 10 deletions test/Pectra.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,19 @@ contract PectraTest is Test {
// ─────────────────────────────────────────────────────────────────────────────

function testGetFee_ConsolidationTarget() public view {
uint256 fee = pectra.getFee(consolidationTarget);
uint256 fee = pectra.getConsolidationFee();
assertEq(fee, 1 wei, "Fee from consolidationTarget should be 1 wei");
}

function testGetFee_ExitTarget() public view {
uint256 fee = pectra.getFee(exitTarget);
uint256 fee = pectra.getExitFee();
assertEq(fee, 1 wei, "Fee from exitTarget should be 1 wei");
}

function testGetFee_FailedCall() public {
// Temporarily set target to revert code
vm.etch(consolidationTarget, revertCode);
uint256 fee = pectra.getFee(consolidationTarget);
uint256 fee = pectra.getConsolidationFee();
assertEq(fee, pectra.MIN_FEE(), "Fee should default to MIN_FEE when call fails");
// Reset back to fee code
vm.etch(consolidationTarget, feeCode);
Expand Down Expand Up @@ -186,7 +186,7 @@ contract PectraTest is Test {
bytes memory target = validPubkey();

// Get the fee from the target
uint256 fee = pectra.getFee(consolidationTarget);
uint256 fee = pectra.getConsolidationFee();
assertEq(fee, 1 wei, "Fee should be 1 wei");

uint256 totalValue = count * fee;
Expand Down Expand Up @@ -258,7 +258,7 @@ contract PectraTest is Test {
}

// Get the fee from the target
uint256 fee = pectra.getFee(consolidationTarget);
uint256 fee = pectra.getConsolidationFee();
assertEq(fee, 1 wei, "Fee should be 1 wei");

uint256 totalValue = count * fee;
Expand Down Expand Up @@ -390,7 +390,7 @@ contract PectraTest is Test {
}

// Get the fee from the target
uint256 fee = pectra.getFee(exitTarget);
uint256 fee = pectra.getExitFee();
assertEq(fee, 1 wei, "Fee should be 1 wei");

uint256 totalValue = count * fee;
Expand All @@ -412,7 +412,7 @@ contract PectraTest is Test {
}

// Get the fee from the target
uint256 fee = pectra.getFee(exitTarget);
uint256 fee = pectra.getExitFee();
assertEq(fee, 1 wei, "Fee should be 1 wei");

uint256 totalValue = count * fee;
Expand All @@ -438,7 +438,7 @@ contract PectraTest is Test {
bytes memory target = validPubkey();

// Get the fee from the target
uint256 fee = pectra.getFee(consolidationTarget);
uint256 fee = pectra.getConsolidationFee();
assertEq(fee, 1 wei, "Fee should be 1 wei");

uint256 totalValue = count * fee;
Expand All @@ -464,7 +464,7 @@ contract PectraTest is Test {
}

// Get the fee from the target
uint256 fee = pectra.getFee(consolidationTarget);
uint256 fee = pectra.getConsolidationFee();
assertEq(fee, 1 wei, "Fee should be 1 wei");

uint256 totalValue = count * fee;
Expand All @@ -490,7 +490,7 @@ contract PectraTest is Test {
}

// Get the fee from the target
uint256 fee = pectra.getFee(exitTarget);
uint256 fee = pectra.getExitFee();
assertEq(fee, 1 wei, "Fee should be 1 wei");

uint256 totalValue = count * fee;
Expand Down