Skip to content

Commit

Permalink
add spark admin transfer code
Browse files Browse the repository at this point in the history
  • Loading branch information
@hexonaut
hexonaut committed Aug 15, 2023
1 parent ebd747a commit c7a5a1a
Show file tree
Hide file tree
Showing 2 changed files with 136 additions and 0 deletions.
50 changes: 50 additions & 0 deletions src/DssSpell.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,27 @@ import "dss-exec-lib/DssAction.sol";
import { VatAbstract } from "dss-interfaces/dss/VatAbstract.sol";
import { GemAbstract } from "dss-interfaces/ERC/GemAbstract.sol";

interface TransferOwnershipLike {
function transferOwnership(address newOwner) external;
}

interface ChangeAdminLike {
function changeAdmin(address newAdmin) external;
}

interface ACLManagerLike {
function DEFAULT_ADMIN_ROLE() external view returns (bytes32);
function addEmergencyAdmin(address admin) external;
function removeEmergencyAdmin(address admin) external;
function removePoolAdmin(address admin) external;
function grantRole(bytes32 role, address account) external;
function revokeRole(bytes32 role, address account) external;
}

interface PoolAddressProviderLike {
function setACLAdmin(address newAclAdmin) external;
}

interface RwaLiquidationLike {
function bump(bytes32 ilk, uint256 val) external;
}
Expand Down Expand Up @@ -103,6 +124,20 @@ contract DssSpellAction is DssAction {
// ---------- New Silver Parameter Changes ----------
address internal immutable MIP21_LIQUIDATION_ORACLE = DssExecLib.getChangelogAddress("MIP21_LIQUIDATION_ORACLE");

// Contracts pulled from Spark official deployment repository
// https://github.com/marsfoundation/sparklend/blob/ca2b72af7c5fb790cc91eaca5d8d4c83fa37e74b/script/output/1/primary-latest.json
// Spark Proxy: https://github.com/marsfoundation/sparklend/blob/ca2b72af7c5fb790cc91eaca5d8d4c83fa37e74b/script/output/1/primary-sce-latest.json#L2
address internal constant SPARK_PROXY = 0x3300f198988e4C9C63F75dF86De36421f06af8c4;
address internal constant SPARK_TREASURY_CONTROLLER = 0x92eF091C5a1E01b3CE1ba0D0150C84412d818F7a;
address internal constant SPARK_TREASURY = 0xb137E7d16564c81ae2b0C8ee6B55De81dd46ECe5;
address internal constant SPARK_TREASURY_DAI = 0x856900aa78e856a5df1a2665eE3a66b2487cD68f;
address internal constant SPARK_INCENTIVES = 0x4370D3b6C9588E02ce9D22e684387859c7Ff5b34;
address internal constant SPARK_WETH_GATEWAY = 0xBD7D6a9ad7865463DE44B05F04559f65e3B11704;
address internal constant SPARK_ACL_MANAGER = 0xdA135Cd78A086025BcdC87B038a1C462032b510C;
address internal constant SPARK_POOL_ADDRESS_PROVIDER = 0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE;
address internal constant SPARK_POOL_ADDRESS_PROVIDER_REGISTRY = 0x03cFa0C4622FF84E50E75062683F44c9587e6Cc1;
address internal constant SPARK_EMISSION_MANAGER = 0xf09e48dd4CA8e76F63a57ADd428bB06fee7932a4;

function actions() public override {
// ---------- EDSR Update ----------
// Forum: https://forum.makerdao.com/t/request-for-gov12-1-2-edit-to-the-stability-scope-to-quickly-modify-enhanced-dsr-based-on-observed-data/21581
Expand Down Expand Up @@ -298,6 +333,21 @@ contract DssSpellAction is DssAction {
DssExecLib.updateCollateralPrice("RWA002-A");

// ---------- Transfer Spark Proxy Admin Controls ----------
TransferOwnershipLike(SPARK_TREASURY_CONTROLLER).transferOwnership(SPARK_PROXY);
ChangeAdminLike(SPARK_TREASURY).changeAdmin(SPARK_PROXY);
ChangeAdminLike(SPARK_TREASURY_DAI).changeAdmin(SPARK_PROXY);
ChangeAdminLike(SPARK_INCENTIVES).changeAdmin(SPARK_PROXY);
TransferOwnershipLike(SPARK_WETH_GATEWAY).transferOwnership(SPARK_PROXY);
ACLManagerLike(SPARK_ACL_MANAGER).addEmergencyAdmin(SPARK_PROXY);
ACLManagerLike(SPARK_ACL_MANAGER).removeEmergencyAdmin(address(this));
ACLManagerLike(SPARK_ACL_MANAGER).removePoolAdmin(address(this));
bytes32 defaultAdminRole = ACLManagerLike(SPARK_ACL_MANAGER).DEFAULT_ADMIN_ROLE();
ACLManagerLike(SPARK_ACL_MANAGER).grantRole(defaultAdminRole, SPARK_PROXY);
ACLManagerLike(SPARK_ACL_MANAGER).revokeRole(defaultAdminRole, address(this));
PoolAddressProviderLike(SPARK_POOL_ADDRESS_PROVIDER).setACLAdmin(SPARK_PROXY);
TransferOwnershipLike(SPARK_POOL_ADDRESS_PROVIDER).transferOwnership(SPARK_PROXY);
TransferOwnershipLike(SPARK_POOL_ADDRESS_PROVIDER_REGISTRY).transferOwnership(SPARK_PROXY);
TransferOwnershipLike(SPARK_EMISSION_MANAGER).transferOwnership(SPARK_PROXY);

// ---------- Trigger Spark Proxy Spell ----------
}
Expand Down
86 changes: 86 additions & 0 deletions src/DssSpell.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,25 @@ interface ProxyLike {
function exec(address target, bytes calldata args) external payable returns (bytes memory out);
}

interface TransferOwnershipLike {
function owner() external view returns (address);
}

interface ChangeAdminLike {
function admin() external view returns (address);
}

interface ACLManagerLike {
function DEFAULT_ADMIN_ROLE() external view returns (bytes32);
function isEmergencyAdmin(address admin) external view returns (bool);
function isPoolAdmin(address admin) external view returns (bool);
function hasRole(bytes32 role, address account) external view returns (bool);
}

interface PoolAddressProviderLike {
function getACLAdmin() external view returns (address);
}

contract DssSpellTest is DssSpellTestBase {
string config;
RootDomain rootDomain;
Expand Down Expand Up @@ -961,4 +980,71 @@ contract DssSpellTest is DssSpellTestBase {
_scheduleWaitAndCast(address(spell));
assertTrue(spell.done());
}

function testSparkAdminTransfer() public {
address SPARK_PROXY = 0x3300f198988e4C9C63F75dF86De36421f06af8c4;
address SPARK_TREASURY_CONTROLLER = 0x92eF091C5a1E01b3CE1ba0D0150C84412d818F7a;
address SPARK_TREASURY = 0xb137E7d16564c81ae2b0C8ee6B55De81dd46ECe5;
address SPARK_TREASURY_DAI = 0x856900aa78e856a5df1a2665eE3a66b2487cD68f;
address SPARK_INCENTIVES = 0x4370D3b6C9588E02ce9D22e684387859c7Ff5b34;
address SPARK_WETH_GATEWAY = 0xBD7D6a9ad7865463DE44B05F04559f65e3B11704;
address SPARK_ACL_MANAGER = 0xdA135Cd78A086025BcdC87B038a1C462032b510C;
address SPARK_POOL_ADDRESS_PROVIDER = 0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE;
address SPARK_POOL_ADDRESS_PROVIDER_REGISTRY = 0x03cFa0C4622FF84E50E75062683F44c9587e6Cc1;
address SPARK_EMISSION_MANAGER = 0xf09e48dd4CA8e76F63a57ADd428bB06fee7932a4;

bytes32 defaultAdminRole = ACLManagerLike(SPARK_ACL_MANAGER).DEFAULT_ADMIN_ROLE();

assertEq(TransferOwnershipLike(SPARK_TREASURY_CONTROLLER).owner(), pauseProxy);

// Transparent proxy dictates that admin() function is only exposed to the admin
vm.startPrank(pauseProxy);

assertEq(ChangeAdminLike(SPARK_TREASURY).admin(), pauseProxy);
assertEq(ChangeAdminLike(SPARK_TREASURY_DAI).admin(), pauseProxy);
assertEq(ChangeAdminLike(SPARK_INCENTIVES).admin(), pauseProxy);

vm.stopPrank();

assertTrue(ACLManagerLike(SPARK_ACL_MANAGER).isEmergencyAdmin(pauseProxy));
assertTrue(!ACLManagerLike(SPARK_ACL_MANAGER).isEmergencyAdmin(SPARK_PROXY));
assertTrue(ACLManagerLike(SPARK_ACL_MANAGER).isPoolAdmin(pauseProxy));
assertTrue(ACLManagerLike(SPARK_ACL_MANAGER).isPoolAdmin(SPARK_PROXY)); // Already added from previous spell
assertTrue(ACLManagerLike(SPARK_ACL_MANAGER).hasRole(defaultAdminRole, pauseProxy));
assertTrue(!ACLManagerLike(SPARK_ACL_MANAGER).hasRole(defaultAdminRole, SPARK_PROXY));

assertEq(TransferOwnershipLike(SPARK_WETH_GATEWAY).owner(), pauseProxy);
assertEq(PoolAddressProviderLike(SPARK_POOL_ADDRESS_PROVIDER).getACLAdmin(), pauseProxy);
assertEq(TransferOwnershipLike(SPARK_POOL_ADDRESS_PROVIDER).owner(), pauseProxy);
assertEq(TransferOwnershipLike(SPARK_POOL_ADDRESS_PROVIDER_REGISTRY).owner(), pauseProxy);
assertEq(TransferOwnershipLike(SPARK_EMISSION_MANAGER).owner(), pauseProxy);

_vote(address(spell));
_scheduleWaitAndCast(address(spell));
assertTrue(spell.done());

assertEq(TransferOwnershipLike(SPARK_TREASURY_CONTROLLER).owner(), SPARK_PROXY);

// Transparent proxy dictates that admin() function is only exposed to the admin
vm.startPrank(SPARK_PROXY);

assertEq(ChangeAdminLike(SPARK_TREASURY).admin(), SPARK_PROXY);
assertEq(ChangeAdminLike(SPARK_TREASURY_DAI).admin(), SPARK_PROXY);
assertEq(ChangeAdminLike(SPARK_INCENTIVES).admin(), SPARK_PROXY);

vm.stopPrank();

assertTrue(!ACLManagerLike(SPARK_ACL_MANAGER).isEmergencyAdmin(pauseProxy));
assertTrue(ACLManagerLike(SPARK_ACL_MANAGER).isEmergencyAdmin(SPARK_PROXY));
assertTrue(!ACLManagerLike(SPARK_ACL_MANAGER).isPoolAdmin(pauseProxy));
assertTrue(ACLManagerLike(SPARK_ACL_MANAGER).isPoolAdmin(SPARK_PROXY));
assertTrue(!ACLManagerLike(SPARK_ACL_MANAGER).hasRole(defaultAdminRole, pauseProxy));
assertTrue(ACLManagerLike(SPARK_ACL_MANAGER).hasRole(defaultAdminRole, SPARK_PROXY));

assertEq(TransferOwnershipLike(SPARK_WETH_GATEWAY).owner(), SPARK_PROXY);
assertEq(PoolAddressProviderLike(SPARK_POOL_ADDRESS_PROVIDER).getACLAdmin(), SPARK_PROXY);
assertEq(TransferOwnershipLike(SPARK_POOL_ADDRESS_PROVIDER).owner(), SPARK_PROXY);
assertEq(TransferOwnershipLike(SPARK_POOL_ADDRESS_PROVIDER_REGISTRY).owner(), SPARK_PROXY);
assertEq(TransferOwnershipLike(SPARK_EMISSION_MANAGER).owner(), SPARK_PROXY);
}
}

0 comments on commit c7a5a1a

Please sign in to comment.