Skip to content

Add setCbeams calls to initExtras #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
oldchili merged 1 commit into from
Apr 30, 2026
Merged

Add setCbeams calls to initExtras #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
23 changes: 18 additions & 5 deletions deploy/PASInit.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,12 @@ interface PASMomLike {
function setAuthority(address) external;
}

struct InitCBeamConfig {
address cBeam;
address[] rateLimits;
address[] controllers;
}

struct InitRateLimitConfig {
bytes32 key;
address rateLimits;
Expand Down Expand Up @@ -149,25 +155,32 @@ library PASInit {
PASInstance memory pasInstance,
uint256 hop,
uint256 maxChange,
address[] memory cBeams,
address[] memory rateLimits,
address[] memory controllers
address[] memory controllers,
InitCBeamConfig[] memory cBeamConfigs
) internal {
require(hop > 0, "PASInit/hop-is-zero");

BeamStateLike beamState = BeamStateLike(pasInstance.beamState);

beamState.setHop(address(0), hop);
beamState.setMaxChange(address(0), maxChange);
for(uint256 i; i < cBeams.length; i++) {
beamState.addCBeam(cBeams[i]);
}
for(uint256 i; i < rateLimits.length; i++) {
beamState.addRateLimits(rateLimits[i]);
}
for(uint256 i; i < controllers.length; i++) {
beamState.addController(controllers[i]);
}
for(uint256 i; i < cBeamConfigs.length; i++) {
InitCBeamConfig memory c = cBeamConfigs[i];
beamState.addCBeam(c.cBeam);
for(uint256 j; j < c.rateLimits.length; j++) {
beamState.setCBeamForRateLimits(c.rateLimits[j], c.cBeam);
}
for(uint256 j; j < c.controllers.length; j++) {
beamState.setCBeamForController(c.controllers[j], c.cBeam);
}
}
}

function initLimitsAndControllerData(
Expand Down
39 changes: 32 additions & 7 deletions test/Integration.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import "dss-test/DssTest.sol";
import { MCD, DssInstance } from "dss-test/MCD.sol";
import { PASInstance } from "deploy/PASInstance.sol";
import { PASDeploy } from "deploy/PASDeploy.sol";
import { PASInit, InitRateLimitConfig, InitControllerActionConfig } from "deploy/PASInit.sol";
import { PASInit, InitRateLimitConfig, InitControllerActionConfig, InitCBeamConfig } from "deploy/PASInit.sol";
import { BeamState } from "src/BeamState.sol";
import { Configurator, RateLimitsLike } from "src/Configurator.sol";
import { Timelock } from "src/timelock/Timelock.sol";
Expand Down Expand Up @@ -234,30 +234,55 @@ contract IntegrationTest is DssTest {
testControllers[0] = SPARK_CONTROLLER;
testControllers[1] = address(0x22);

// cBeam[0] is paired with both rateLimits and both controllers; cBeam[1] gets only the second rateLimits
InitCBeamConfig[] memory cBeamConfigs = new InitCBeamConfig[](2);
cBeamConfigs[0] = InitCBeamConfig({
cBeam: testCBeams[0],
rateLimits: testRateLimits,
controllers: testControllers
});
address[] memory cBeam1RateLimits = new address[](1);
cBeam1RateLimits[0] = testRateLimits[1];
cBeamConfigs[1] = InitCBeamConfig({
cBeam: testCBeams[1],
rateLimits: cBeam1RateLimits,
controllers: new address[](0)
});

vm.startPrank(pauseProxy);
PASInit.initExtras(freshPas, hop, maxChange, testCBeams, testRateLimits, testControllers);
PASInit.initExtras(freshPas, hop, maxChange, testRateLimits, testControllers, cBeamConfigs);
vm.stopPrank();

// Verify default hop and maxChange are set
assertEq(freshBeamState.getHop(address(0)), hop, "default hop should be set");
assertEq(freshBeamState.getMaxChange(address(0)), maxChange, "default maxChange should be set");

// Verify cBeams are added
assertEq(freshBeamState.cBeams(testCBeams[0]), 1, "first cBeam should be added");
assertEq(freshBeamState.cBeams(testCBeams[1]), 1, "second cBeam should be added");

// Verify rateLimits are added
assertEq(freshBeamState.rateLimits(testRateLimits[0]), 1, "first rateLimits should be added");
assertEq(freshBeamState.rateLimits(testRateLimits[1]), 1, "second rateLimits should be added");

// Verify controllers are added
assertEq(freshBeamState.controllers(testControllers[0]), 1, "first controller should be added");
assertEq(freshBeamState.controllers(testControllers[1]), 1, "second controller should be added");

// Verify cBeams are added
assertEq(freshBeamState.cBeams(testCBeams[0]), 1, "first cBeam should be added");
assertEq(freshBeamState.cBeams(testCBeams[1]), 1, "second cBeam should be added");

// Verify cBeam pairings
assertEq(freshBeamState.rateLimitsCBeams(testRateLimits[0], testCBeams[0]), 1, "cBeam0<->rateLimits0 paired");
assertEq(freshBeamState.rateLimitsCBeams(testRateLimits[1], testCBeams[0]), 1, "cBeam0<->rateLimits1 paired");
assertEq(freshBeamState.controllersCBeams(testControllers[0], testCBeams[0]), 1, "cBeam0<->controller0 paired");
assertEq(freshBeamState.controllersCBeams(testControllers[1], testCBeams[0]), 1, "cBeam0<->controller1 paired");
assertEq(freshBeamState.rateLimitsCBeams(testRateLimits[0], testCBeams[1]), 0, "cBeam1<->rateLimits0 not paired");
assertEq(freshBeamState.rateLimitsCBeams(testRateLimits[1], testCBeams[1]), 1, "cBeam1<->rateLimits1 paired");
assertEq(freshBeamState.controllersCBeams(testControllers[0], testCBeams[1]), 0, "cBeam1<->controller0 not paired");
assertEq(freshBeamState.controllersCBeams(testControllers[1], testCBeams[1]), 0, "cBeam1<->controller1 not paired");
}

function initExtras() external {
PASInstance memory freshPas = PASDeploy.deploy(address(this), address(this), MIN_DELAY);
PASInit.initExtras(freshPas, 0, 1.5 ether, new address[](0), new address[](0), new address[](0));
PASInit.initExtras(freshPas, 0, 1.5 ether, new address[](0), new address[](0), new InitCBeamConfig[](0));
}

function testInitExtrasRevertsWhenHopIsZero() public {
Expand Down
Loading