Skip to content

refactor: remove receive() stubs #282

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
wjmelements merged 3 commits into from
Jun 25, 2026
Merged

refactor: remove receive() stubs #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb1e335
test: remove redundant receive() stubs from test contracts
wjmelements Jun 24, 2026
0b2a152
test: add FVMPay balance assertions for burn, refund, and deposit return
wjmelements Jun 24, 2026
b83b3b9
deps: update fvm-solidity
wjmelements Jun 24, 2026
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
2 changes: 1 addition & 1 deletion lib/fvm-solidity
Open in desktop
Submodule fvm-solidity updated 43 files
+2 −0 .env.example
+132 −0 .gas-snapshot
+35 −0 .github/workflows/gas.yml
+2 −0 .github/workflows/lint.yml
+2 −0 .github/workflows/test.yml
+7 −0 .gitignore
+11 −0 Makefile
+147 −7 README.md
+12 −0 foundry.toml
+1 −1 lib/forge-std
+53 −0 src/CalldataUtils.sol
+54 −0 src/Demo.sol
+102 −0 src/FVMActor.sol
+27 −0 src/FVMActors.sol
+60 −0 src/FVMAddress.sol
+3 −0 src/FVMCodec.sol
+48 −1 src/FVMErrors.sol
+48 −0 src/FVMMethod.sol
+194 −0 src/FVMMiner.sol
+4 −1 src/FVMRandom.sol
+259 −0 src/FVMSector.sol
+509 −0 src/FVMSectorContentChanged.sol
+105 −0 src/mocks/FVMActor.sol
+21 −9 src/mocks/FVMCallActorByAddress.sol
+202 −23 src/mocks/FVMCallActorById.sol
+357 −0 src/mocks/FVMMinerActor.sol
+20 −0 src/mocks/FVMStoragePowerActor.sol
+25 −3 src/mocks/MockFVMTest.sol
+244 −0 test/Actor.t.sol
+67 −0 test/Burn.t.sol
+22 −0 test/CallActorById.t.sol
+121 −0 test/CalldataUtils.t.sol
+142 −0 test/GetNominalSectorExpiration.t.sol
+35 −0 test/MaskedAddress.t.sol
+25 −0 test/Miner.t.sol
+4 −0 test/Pay.t.sol
+286 −0 test/SectorContentChanged.t.sol
+82 −0 test/StoragePower.t.sol
+219 −0 test/ValidateSectorStatus.t.sol
+136 −0 test/miner/GetOwner.t.sol
+61 −0 test/miner/IsMiner.t.sol
+284 −0 test/miner/ValidateSectorStatus.t.sol
+65 −2 tools/deploy-demo.sh
9 changes: 7 additions & 2 deletions test/CleanupPieces.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ contract PDPVerifierCleanupTest is MockFVMTest, PieceHelper {
TestListener listener;
bytes empty = new bytes(0);

receive() external payable {}

function setUp() public override {
super.setUp();
PDPVerifier pdpVerifierImpl = new PDPVerifier(1, CHALLENGE_FINALITY_DELAY);
Expand Down Expand Up @@ -177,6 +175,7 @@ contract PDPVerifierCleanupTest is MockFVMTest, PieceHelper {

// Net cost is zero; the cleanup deposit was returned at delete time
assertEq(balanceBefore, address(this).balance, "net cost is zero");
assertEq(address(pdpVerifier).balance, 0, "Verifier balance is 0 after deposit returned");
assertFalse(pdpVerifier.dataSetLive(setId));
}

Expand All @@ -202,8 +201,11 @@ contract PDPVerifierCleanupTest is MockFVMTest, PieceHelper {
pdpVerifier.cleanupPieces(setId, 10);

// SP succeeds
uint256 balanceBefore = address(this).balance;
bool done = pdpVerifier.cleanupPieces(setId, 10);
assertTrue(done);
assertEq(address(this).balance - balanceBefore, PDPFees.cleanupDeposit(), "SP receives deposit");
assertEq(address(pdpVerifier).balance, 0, "Verifier balance is 0 after cleanup");
assertPieceSlotsCleared(setId, 1);
}

Expand All @@ -221,6 +223,7 @@ contract PDPVerifierCleanupTest is MockFVMTest, PieceHelper {
bool done = pdpVerifier.cleanupPieces(setId, 10);
assertTrue(done);
assertEq(anyone.balance - balanceBefore, PDPFees.cleanupDeposit(), "third party receives deposit");
assertEq(address(pdpVerifier).balance, 0, "Verifier balance is 0 after cleanup");
assertPieceSlotsCleared(setId, 1);
}

Expand All @@ -245,6 +248,7 @@ contract PDPVerifierCleanupTest is MockFVMTest, PieceHelper {

assertTrue(done);
assertEq(address(this).balance - balanceBefore, PDPFees.cleanupDeposit(), "SP receives deposit in same block");
assertEq(address(pdpVerifier).balance, 0, "Verifier balance is 0 after cleanup");
assertPieceSlotsCleared(setId, 2);
}

Expand All @@ -266,6 +270,7 @@ contract PDPVerifierCleanupTest is MockFVMTest, PieceHelper {

assertTrue(done);
assertEq(anyone.balance - balanceBefore, PDPFees.cleanupDeposit(), "deleter collects cleanup deposit");
assertEq(address(pdpVerifier).balance, 0, "Verifier balance is 0 after cleanup");
assertPieceSlotsCleared(setId, 2);
}

Expand Down
30 changes: 21 additions & 9 deletions test/PDPVerifier.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
pragma solidity ^0.8.13;

import {MockFVMTest} from "fvm-solidity/mocks/MockFVMTest.sol";
import {BURN_ADDRESS} from "fvm-solidity/FVMActors.sol";
import {Test} from "forge-std/Test.sol";
import {UUPSUpgradeable} from "../lib/openzeppelin-contracts-upgradeable/contracts/proxy/utils/UUPSUpgradeable.sol";
import {Cids} from "../src/Cids.sol";
Expand Down Expand Up @@ -62,12 +63,21 @@ contract PDPVerifierDataSetCreateDeleteTest is MockFVMTest, PieceHelper {
}

function testDeleteDataSet() public {
uint256 deposit = PDPFees.cleanupDeposit();
uint256 callerBefore = address(this).balance;

vm.expectEmit(true, true, false, false);
emit IPDPEvents.DataSetCreated(1, address(this));
uint256 setId = pdpVerifier.createDataSet{value: PDPFees.cleanupDeposit()}(address(listener), empty);
uint256 setId = pdpVerifier.createDataSet{value: deposit}(address(listener), empty);
assertEq(address(pdpVerifier).balance, deposit, "Verifier holds deposit after create");

vm.expectEmit(true, true, false, false);
emit IPDPEvents.DataSetDeleted(setId, 0);
pdpVerifier.deleteDataSet(setId, empty);

assertEq(address(pdpVerifier).balance, 0, "Verifier balance is 0 after delete");
assertEq(address(this).balance, callerBefore, "Caller recovered deposit");

vm.expectRevert(PDPVerifier.DataSetNotLive.selector);
pdpVerifier.getDataSetLeafCount(setId);
}
Expand Down Expand Up @@ -139,8 +149,6 @@ contract PDPVerifierDataSetCreateDeleteTest is MockFVMTest, PieceHelper {
assertEq(3, pdpVerifier.getNextDataSetId(), "Next data set ID should be 3");
}

receive() external payable {}

function testDataSetIdsStartFromOne() public {
// Test that data set IDs start from 1, not 0
assertEq(pdpVerifier.getNextDataSetId(), 1, "Next data set ID should start at 1");
Expand Down Expand Up @@ -170,6 +178,7 @@ contract PDPVerifierDataSetCreateDeleteTest is MockFVMTest, PieceHelper {
uint256 finalBalance = address(this).balance;
uint256 refundedAmount = finalBalance - (initialBalance - required - excessAmount);
assertEq(refundedAmount, excessAmount, "Excess amount should be refunded");
assertEq(address(pdpVerifier).balance, required, "Verifier holds exactly the cleanup deposit");

// Additional checks to ensure the data set was created correctly
assertEq(pdpVerifier.getDataSetLeafCount(setId), 0, "Data set leaf count should be 0");
Expand Down Expand Up @@ -338,8 +347,6 @@ contract PDPVerifierDataSetMutateTest is MockFVMTest, PieceHelper {
TestingRecordKeeperService listener;
bytes empty = new bytes(0);

receive() external payable {}

function setUp() public override {
super.setUp();
PDPVerifier pdpVerifierImpl = new PDPVerifier(1, CHALLENGE_FINALITY_DELAY);
Expand Down Expand Up @@ -1984,8 +1991,6 @@ contract PDPVerifierE2ETest is MockFVMTest, ProofBuilderHelper, PieceHelper {
vm.deal(address(pdpVerifierImpl), 100 ether);
}

receive() external payable {}

function testCompleteProvingPeriodE2E() public {
// Step 1: Create a data set
uint256 setId = pdpVerifier.addPieces{value: PDPFees.cleanupDeposit()}(
Expand Down Expand Up @@ -2069,7 +2074,16 @@ contract PDPVerifierE2ETest is MockFVMTest, ProofBuilderHelper, PieceHelper {
pdpVerifier.getNextChallengeEpoch(setId), pdpVerifier.getNextChallengeEpoch(setId)
);

uint256 proofFee = pdpVerifier.calculateProofFee(setId);
uint256 burnBefore = BURN_ADDRESS.balance;
uint256 verifierBefore = address(pdpVerifier).balance;
pdpVerifier.provePossession{value: 1e18}(setId, proofsProofPeriod1);
assertEq(BURN_ADDRESS.balance - burnBefore, proofFee, "Proof fee burned to burn address");
assertEq(
address(pdpVerifier).balance,
verifierBefore,
"Verifier balance unchanged: deposit held, fee burned, overpay refunded"
);

pdpVerifier.nextProvingPeriod(setId, vm.getBlockNumber() + CHALLENGE_FINALITY_DELAY, empty);
// CHECK: leaf counts
Expand Down Expand Up @@ -2237,8 +2251,6 @@ contract PDPVerifierFeeTest is MockFVMTest, PieceHelper, ProofBuilderHelper {
listener = new TestingRecordKeeperService();
}

receive() external payable {}

function testUpdateProofFeeWithDelayAutoApply() public {
uint256 current = pdpVerifier.feePerTiB();
uint256 newFee = current + 1;
Expand Down
22 changes: 20 additions & 2 deletions test/PDPVerifierProofTest.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
pragma solidity ^0.8.13;

import {MockFVMTest} from "fvm-solidity/mocks/MockFVMTest.sol";
import {BURN_ADDRESS} from "fvm-solidity/FVMActors.sol";
import {Cids} from "../src/Cids.sol";
import {PDPVerifier} from "../src/PDPVerifier.sol";
import {MyERC1967Proxy} from "../src/ERC1967Proxy.sol";
Expand Down Expand Up @@ -51,7 +52,16 @@ contract PDPVerifierProofTest is MockFVMTest, ProofBuilderHelper, PieceHelper {
challenges[i] = IPDPTypes.PieceIdAndOffset(0, 0);
}
emit IPDPEvents.PossessionProven(setId, challenges);
uint256 proofFee = pdpVerifier.calculateProofFee(setId);
uint256 burnBefore = BURN_ADDRESS.balance;
uint256 verifierBefore = address(pdpVerifier).balance;
pdpVerifier.provePossession{value: 1e18}(setId, proofs);
assertEq(BURN_ADDRESS.balance - burnBefore, proofFee, "Proof fee burned to burn address");
assertEq(
address(pdpVerifier).balance,
verifierBefore,
"Verifier balance unchanged: deposit held, fee burned, overpay refunded"
);

// Verify the next challenge is in a subsequent epoch.
// Next challenge unchanged by prove
Expand All @@ -63,8 +73,6 @@ contract PDPVerifierProofTest is MockFVMTest, ProofBuilderHelper, PieceHelper {
assertEq(pdpVerifier.getNextChallengeEpoch(setId), vm.getBlockNumber() + CHALLENGE_FINALITY_DELAY);
}

receive() external payable {}

event Debug(string message, uint256 value);

function testProveWithDifferentFeeAmounts() public {
Expand Down Expand Up @@ -107,7 +115,17 @@ contract PDPVerifierProofTest is MockFVMTest, ProofBuilderHelper, PieceHelper {

// Test 2: Sending more than the required fee
RANDOMNESS_PRECOMPILE.mockBeaconRandomness(challengeEpoch, challengeEpoch);
uint256 burnBefore = BURN_ADDRESS.balance;
uint256 senderBefore = sender.balance;
uint256 verifierBefore = address(pdpVerifier).balance;
pdpVerifier.provePossession{value: correctFee + 1}(setId, proofs);
assertEq(BURN_ADDRESS.balance - burnBefore, correctFee, "Proof fee burned to burn address");
assertEq(senderBefore - sender.balance, correctFee, "Sender net loss equals fee; 1 wei overpay refunded");
assertEq(
address(pdpVerifier).balance,
verifierBefore,
"Verifier balance unchanged: deposit held, fee burned, overpay refunded"
);

// Verify that the proof was accepted
assertEq(
Expand Down
Loading