Skip to content

Timelock init functions: unpause + admin permission in Beacon #16

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

Open
sunbreak1211 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Timelock init functions: unpause + admin permission in Beacon #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43a3919
Add init functions for timelock: unpause and beacon admin permission
sunbreak1211 Aug 31, 2026
403aebf
Remove unused interface function
sunbreak1211 Sep 1, 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
27 changes: 27 additions & 0 deletions deploy/PASInit.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ interface TimelockLike {
function grantRole(bytes32, address) external;
function revokeRole(bytes32, address) external;
function pause() external;
function unpause() external;
}

interface PASMomLike {
Expand All @@ -63,6 +64,11 @@ interface PASMomLike {
function setAuthority(address) external;
}

interface BeaconLike {
function DEFAULT_ADMIN_ROLE() external view returns (bytes32);
function grantRole(bytes32, address) external;
}

struct InitCBeamConfig {
address cBeam;
address[] rateLimits;
Expand Down Expand Up @@ -160,6 +166,19 @@ library PASInit {
timelock.revokeRole(timelock.PAUSER_ROLE(), admin);
}

function unpauseTimelock(
address timelock_,
address[] memory pausers
) internal {
TimelockLike timelock = TimelockLike(timelock_);

timelock.unpause();

for (uint256 i = 0; i < pausers.length; ++i) {
timelock.grantRole(timelock.PAUSER_ROLE(), pausers[i]);
}
}

function initExtras(
PASInstance memory pasInstance,
uint256 hop,
Expand Down Expand Up @@ -255,4 +274,12 @@ library PASInit {

dss.chainlog.setAddress(key, address(mom));
}

function relyTimelockInBeacon(
address beacon_,
address timelock
) internal {
BeaconLike beacon = BeaconLike(beacon_);
beacon.grantRole(beacon.DEFAULT_ADMIN_ROLE(), timelock);
}
}
110 changes: 108 additions & 2 deletions test/Integration.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,37 @@ interface ChiefLike {
function hat() external view returns (address);
}

// Interface for the PAU Beacon (OZ AccessControl + integration registry)
interface BeaconLike {
struct Wire {
bytes4 callSelector;
bytes4 delegateSelector;
}

struct Config {
address facet;
Wire[] wires;
}

struct Dispatch {
address facet;
bytes4 delegateSelector;
}

function DEFAULT_ADMIN_ROLE() external view returns (bytes32);
function hasRole(bytes32 role, address account) external view returns (bool);
function setIntegration(bytes32 id, Config calldata config) external;
function getConfig(bytes32 id) external view returns (Config memory);
function getDispatch(bytes4 callSelector) external view returns (Dispatch memory);
}

// Minimal contract standing in as a new facet (the beacon only requires non-empty code)
contract FacetMock {
function pasFacetAction(uint256 value) external pure returns (uint256) {
return value;
}
}

// Interface for SparkController
interface ControllerLike {
function rateLimits() external view returns (address);
Expand Down Expand Up @@ -198,6 +229,74 @@ contract IntegrationTest is DssTest {
assertEq(beamState.wards(address(mom)), 1, "mom should have wards on beamState");
}

function testRelyTimelockInBeacon() public {
BeaconLike beacon = BeaconLike(dss.chainlog.getAddress("PAU_BEACON"));
bytes32 adminRole = beacon.DEFAULT_ADMIN_ROLE();

assertFalse(beacon.hasRole(adminRole, address(timelock)), "timelock should not be beacon admin before");

// Prepare proposal for adding facet to beacon
bytes32 integrationId = "PAS_TEST_FACET";
address facet = address(new FacetMock());
bytes4 callSelector = bytes4(keccak256("pasIntegrationTestAction(uint256)"));

BeaconLike.Wire[] memory wires = new BeaconLike.Wire[](1);
wires[0] = BeaconLike.Wire({
callSelector: callSelector,
delegateSelector: FacetMock.pasFacetAction.selector
});
BeaconLike.Config memory config = BeaconLike.Config({ facet: facet, wires: wires });

assertEq(beacon.getConfig(integrationId).facet, address(0), "integration should not exist yet");
assertEq(beacon.getDispatch(callSelector).facet, address(0), "call selector should not be wired yet");

address[] memory targets = new address[](1);
uint256[] memory values = new uint256[](1);
bytes[] memory payloads = new bytes[](1);
targets[0] = address(beacon);
payloads[0] = abi.encodeCall(BeaconLike.setIntegration, (integrationId, config));

bytes32 salt = keccak256("add-beacon-facet");

// The coreCouncil is the timelock proposer
vm.prank(coreCouncil);
timelock.scheduleBatch(targets, values, payloads, bytes32(0), salt, MIN_DELAY);

bytes32 opId = timelock.hashOperationBatch(targets, values, payloads, bytes32(0), salt);
assertTrue(timelock.isOperationPending(opId), "operation should be pending");

vm.warp(block.timestamp + MIN_DELAY);

// The beacon rejects the timelock, and the timelock bubbles the error up
vm.expectRevert(abi.encodeWithSignature(
"AccessControlUnauthorizedAccount(address,bytes32)",
address(timelock),
OZ_DEFAULT_ADMIN_ROLE
));
timelock.executeBatch(targets, values, payloads, bytes32(0), salt);

// Now the spell grants the timelock the beacon admin role
vm.startPrank(pauseProxy);
PASInit.relyTimelockInBeacon(address(beacon), address(timelock));
vm.stopPrank();

assertTrue(beacon.hasRole(adminRole, address(timelock)), "timelock should be beacon admin after");

timelock.executeBatch(targets, values, payloads, bytes32(0), salt);

assertTrue(timelock.isOperationDone(opId), "operation should be done");

// The facet is registered and its selector wired on the beacon
BeaconLike.Config memory stored = beacon.getConfig(integrationId);
assertEq(stored.facet, facet, "facet should be registered");
assertEq(stored.wires.length, 1, "one wire should be registered");
assertEq(stored.wires[0].callSelector, callSelector, "call selector should be stored");
assertEq(stored.wires[0].delegateSelector, FacetMock.pasFacetAction.selector, "delegate selector should be stored");

BeaconLike.Dispatch memory dispatch = beacon.getDispatch(callSelector);
assertEq(dispatch.facet, facet, "dispatch should point at the new facet");
assertEq(dispatch.delegateSelector, FacetMock.pasFacetAction.selector, "dispatch delegate selector should be set");
}

function testPauseThenUnpauseTimelock() public {
PASInstance memory freshPas = PASDeploy.deploy(address(this), pauseProxy, MIN_DELAY);
Expand Down Expand Up @@ -225,14 +324,21 @@ contract IntegrationTest is DssTest {
freshTimelock.scheduleBatch(targets, values, payloads, bytes32(0), SALT, MIN_DELAY);

// unpause() resumes operations (needs only DEFAULT_ADMIN_ROLE, so the admin calls it directly)
vm.prank(pauseProxy);
freshTimelock.unpause();
address[] memory pausers = new address[](2);
pausers[0] = address(0x11);
pausers[1] = address(0x22);
vm.startPrank(pauseProxy);
PASInit.unpauseTimelock(freshPas.timelock, pausers);
vm.stopPrank();
assertFalse(freshTimelock.paused(), "timelock should be unpaused");

vm.prank(coreCouncil);
freshTimelock.scheduleBatch(targets, values, payloads, bytes32(0), SALT, MIN_DELAY);
bytes32 opId = freshTimelock.hashOperationBatch(targets, values, payloads, bytes32(0), SALT);
assertTrue(freshTimelock.isOperationPending(opId), "operation should schedule after unpause");

assertTrue(freshTimelock.hasRole(freshTimelock.PAUSER_ROLE(), pausers[0]));
assertTrue(freshTimelock.hasRole(freshTimelock.PAUSER_ROLE(), pausers[1]));
}

function testInitExtras() public {
Expand Down
Loading