Skip to content

chore: Use two step ownership transfer #11

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
pyropy merged 1 commit into from
Jan 12, 2026
Merged

chore: Use two step ownership transfer #11

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
4 changes: 2 additions & 2 deletions src/FilBeamOperator.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
pragma solidity ^0.8.13;

import "./Errors.sol";
import "@openzeppelin/contracts/access/Ownable.sol";
import {Ownable, Ownable2Step} from "@openzeppelin/contracts/access/Ownable2Step.sol";
import {FilecoinPayV1} from "@filecoin-pay/FilecoinPayV1.sol";
import {FilecoinWarmStorageService} from "@filecoin-services/FilecoinWarmStorageService.sol";
import {FilecoinWarmStorageServiceStateView} from "@filecoin-services/FilecoinWarmStorageServiceStateView.sol";

contract FilBeamOperator is Ownable {
contract FilBeamOperator is Ownable2Step {
struct DataSetUsage {
uint256 cdnAmount;
uint256 cacheMissAmount;
Expand Down
16 changes: 11 additions & 5 deletions test/FilBeamOperator.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,11 +448,22 @@ contract FilBeamOperatorTest is Test {
}

function test_TransferOwnership() public {
assertEq(filBeam.owner(), owner);

vm.prank(owner);
filBeam.transferOwnership(user1);
assertEq(filBeam.pendingOwner(), user1);

vm.prank(user1);
filBeam.acceptOwnership();
assertEq(filBeam.owner(), user1);

vm.prank(user1);
filBeam.transferOwnership(user2);
assertEq(filBeam.pendingOwner(), user2);

vm.prank(user2);
filBeam.acceptOwnership();
assertEq(filBeam.owner(), user2);
}

Expand All @@ -462,11 +473,6 @@ contract FilBeamOperatorTest is Test {
filBeam.transferOwnership(user2);
}

function test_TransferOwnershipRevertZeroAddress() public {
vm.expectRevert();
filBeam.transferOwnership(address(0));
}

function test_MultipleDataSets() public {
vm.startPrank(filBeamOperatorController);
filBeam.recordUsageRollups(
Expand Down