Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 contracts/test/integration/utils/RoleHierarchy.sol
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ contract RoleHierarchy is DSTest {
mapping(bytes32 => address[]) public roleToAddress;
Vm public constant vm = Vm(HEVM_ADDRESS);

constructor() public {
constructor() {
/// roles and their hierarchies are the same on both mainnet and arbitrum
roleHierarchy.setRole(TribeRoles.GOVERNOR);
roleHierarchy.insert(TribeRoles.GOVERNOR, TribeRoles.GUARDIAN);
Expand Down
3 changes: 2 additions & 1 deletion contracts/test/integration/vip/Runner.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
pragma solidity =0.8.13;

import {vip5} from "./vip5.sol";
import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";
import {TimelockSimulation} from "../utils/TimelockSimulation.sol";
import {MainnetAddresses} from "../fixtures/MainnetAddresses.sol";
Expand All @@ -8,7 +9,7 @@ import {PCVGuardian} from "./../../../pcv/PCVGuardian.sol";

/// @dev test harness for running and simulating VOLT Improvement Proposals
/// inherit the proposal to simulate
contract Runner is TimelockSimulation {
contract Runner is TimelockSimulation, vip5 {
/// @notice mainnet PCV Guardian
PCVGuardian private immutable mainnetPCVGuardian =
PCVGuardian(MainnetAddresses.PCV_GUARDIAN);
Expand Down
64 changes: 64 additions & 0 deletions contracts/test/integration/vip/vip5.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
pragma solidity =0.8.13;

import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";
import {TimelockSimulation} from "../utils/TimelockSimulation.sol";
import {MainnetAddresses} from "../fixtures/MainnetAddresses.sol";
import {ArbitrumAddresses} from "../fixtures/ArbitrumAddresses.sol";
import {DSTest} from "./../../unit/utils/DSTest.sol";
import {Core} from "../../../core/Core.sol";
import {Vm} from "./../../unit/utils/Vm.sol";
import {IVIP} from "./IVIP.sol";
import {AllRoles} from "./../utils/AllRoles.sol";
import {Volt} from "../../../volt/Volt.sol";

contract vip5 is DSTest, IVIP, AllRoles {
Vm public constant vm = Vm(HEVM_ADDRESS);

uint256 constant voltBalance = 10_000_000e18;

function getMainnetProposal()
public
pure
override
returns (TimelockSimulation.action[] memory proposal)
{
proposal = new TimelockSimulation.action[](1);

proposal[0].target = MainnetAddresses.VOLT;
proposal[0].value = 0;
proposal[0].arguments = abi.encodeWithSignature(
"burn(uint256)",
voltBalance
);
proposal[0].description = "Burn 10m VOLT in deprecated timelock";
}

function mainnetSetup() public override {}

/// assert all contracts have their correct number of roles now,
/// and that the proper addresses have the correct role after the governance upgrade
function mainnetValidate() public override {
uint256 deprecatedTimelockVoltBalance = Volt(MainnetAddresses.VOLT)
.balanceOf(MainnetAddresses.VOLT_TIMELOCK);

assertEq(deprecatedTimelockVoltBalance, 0);
}

/// prevent errors by reverting on arbitrum proposal functions being called on this VIP
function getArbitrumProposal()
public
pure
override
returns (TimelockSimulation.action[] memory)
{
revert("no arbitrum proposal");
}

function arbitrumSetup() public override {
revert("no arbitrum proposal");
}

function arbitrumValidate() public override {
revert("no arbitrum proposal");
}
}
17 changes: 17 additions & 0 deletions proposals/vip_5.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { ProposalDescription } from '@custom-types/types';

const vip_5: ProposalDescription = {
title: 'VIP-5: Burn Deprecated Timelock VOLT',
commands: [
{
target: 'volt',
values: '0',
method: 'burn(uint256)',
arguments: ['10000000000000000000000000'],
description: 'Burn 10m VOLT in deprecated timelock'
}
],
description: 'Burn 10m VOLT collateral from Tribe DAO loan'
};

export default vip_5;