diff --git a/src/DssSpell.sol b/src/DssSpell.sol index c99df3f7d..47140632a 100644 --- a/src/DssSpell.sol +++ b/src/DssSpell.sol @@ -32,18 +32,22 @@ interface RwaLiquidationOracleLike { contract DssSpellAction is DssAction { // Provides a descriptive tag for bot consumption // This should be modified weekly to provide a summary of the actions - // Hash: cast keccak -- "$(wget 'TODO' -q -O - 2>/dev/null)" + // Hash: cast keccak -- "$(wget 'https://raw.githubusercontent.com/makerdao/community/c0eb5feb51cf5a8d0dcdcd4436976d3b4f3da913/governance/votes/Executive%20vote%20-%20September%2027%2C%202023.md' -q -O - 2>/dev/null)" string public constant override description = - "2023-09-30 MakerDAO Executive Spell | Hash: TODO"; + "2023-09-30 MakerDAO Executive Spell | Hash: 0x3906bcfefa6d515aae83aba7dae150afde5772699e6a0741f3e89d344315aa36"; // Set office hours according to the summary function officeHours() public pure override returns (bool) { return false; } - // ----- Approve HV Bank (RWA009-A) DAO Resolution ----- - // Forum: http://forum.makerdao.com/t/request-to-poll-offboarding-legacy-legal-recourse-assets/21582 - // Poll: https://vote.makerdao.com/polling/QmNgKzcG - // Approve DAO resolution hash QmXU2TwsRpVevGY74NVFbD9bKwtsw1mSuSce7My1zinD9m + + // ----- RWA007-A (Clydesdale) DAO Resolution ----- + // Poll: https://vote.makerdao.com/polling/Qmb45PDU + // Forum: https://forum.makerdao.com/t/proposal-to-revise-asset-allocation-of-jat1-and-jat2/21718 + // Approve the DAO Resolution with hash QmZ94FG8YXK4seyBHBi2FfTfW5URtBqbCb7JZAB1HGkTNF + + // Comma-separated list of DAO resolutions IPFS hashes. + string public constant dao_resolutions = "QmZ94FG8YXK4seyBHBi2FfTfW5URtBqbCb7JZAB1HGkTNF"; // Many of the settings that change weekly rely on the rate accumulator // described at https://docs.makerdao.com/smart-contract-modules/rates-module @@ -58,6 +62,8 @@ contract DssSpellAction is DssAction { // ---------- Math ---------- + // ---------- MCD Contracts ---------- + address internal immutable MIP21_LIQUIDATION_ORACLE = DssExecLib.getChangelogAddress("MIP21_LIQUIDATION_ORACLE"); // ---------- Spark Proxy ---------- @@ -81,7 +87,6 @@ contract DssSpellAction is DssAction { } function actions() public override { - // ----- RWA007-A (Clydesdale) DAO Resolution ----- // Poll: https://vote.makerdao.com/polling/Qmb45PDU // Forum: https://forum.makerdao.com/t/proposal-to-revise-asset-allocation-of-jat1-and-jat2/21718 @@ -107,7 +112,6 @@ contract DssSpellAction is DssAction { // Poll: https://vote.makerdao.com/polling/QmVcxd7J // Forum: https://forum.makerdao.com/t/proposal-for-activation-of-gnosis-chain-instance/22098/8 ProxyLike(SPARK_PROXY).exec(SPARK_SPELL, abi.encodeWithSignature("execute()")); - } } diff --git a/src/test/config.sol b/src/test/config.sol index c9ea4680c..23380e022 100644 --- a/src/test/config.sol +++ b/src/test/config.sol @@ -76,9 +76,9 @@ contract Config { bool offboarding; } - uint256 constant private THOUSAND = 10 ** 3; - uint256 constant private MILLION = 10 ** 6; - uint256 constant private BILLION = 10 ** 9; + uint256 constant private THOUSAND = 10 ** 3; + uint256 constant private MILLION = 10 ** 6; + uint256 constant private BILLION = 10 ** 9; SpellValues spellValues; SystemValues afterSpell; @@ -103,25 +103,25 @@ contract Config { // // Values for all system configuration changes // - afterSpell.line_offset = 680 * MILLION; // Offset between the global line against the sum of local lines - afterSpell.pot_dsr = 5_00; // In basis points - afterSpell.pause_delay = 48 hours; // In seconds - afterSpell.vow_wait = 156 hours; // In seconds - afterSpell.vow_dump = 250; // In whole Dai units - afterSpell.vow_sump = 50 * THOUSAND; // In whole Dai units - afterSpell.vow_bump = 20 * THOUSAND; // In whole Dai units - afterSpell.vow_hump_min = 50 * MILLION; // In whole Dai units - afterSpell.vow_hump_max = 50 * MILLION; // In whole Dai units - afterSpell.flap_hop = 6308 seconds; // In seconds - afterSpell.flap_want = 9800; // In basis points - afterSpell.dog_Hole = 70 * MILLION; // In whole Dai units - afterSpell.esm_min = 150 * THOUSAND; // In whole MKR units - afterSpell.pause_authority = chief; // Pause authority - afterSpell.osm_mom_authority = chief; // OsmMom authority - afterSpell.clipper_mom_authority = chief; // ClipperMom authority - afterSpell.d3m_mom_authority = chief; // D3MMom authority - afterSpell.ilk_count = 64; // Num expected in system - afterSpell.chainlog_version = "1.17.0"; // String expected in system + afterSpell.line_offset = 680 * MILLION; // Offset between the global line against the sum of local lines + afterSpell.pot_dsr = 5_00; // In basis points + afterSpell.pause_delay = 48 hours; // In seconds + afterSpell.vow_wait = 156 hours; // In seconds + afterSpell.vow_dump = 250; // In whole Dai units + afterSpell.vow_sump = 50 * THOUSAND; // In whole Dai units + afterSpell.vow_bump = 20 * THOUSAND; // In whole Dai units + afterSpell.vow_hump_min = 50 * MILLION; // In whole Dai units + afterSpell.vow_hump_max = 50 * MILLION; // In whole Dai units + afterSpell.flap_hop = 6308 seconds; // In seconds + afterSpell.flap_want = 9800; // In basis points + afterSpell.dog_Hole = 70 * MILLION; // In whole Dai units + afterSpell.esm_min = 150 * THOUSAND; // In whole MKR units + afterSpell.pause_authority = chief; // Pause authority + afterSpell.osm_mom_authority = chief; // OsmMom authority + afterSpell.clipper_mom_authority = chief; // ClipperMom authority + afterSpell.d3m_mom_authority = chief; // D3MMom authority + afterSpell.ilk_count = 64; // Num expected in system + afterSpell.chainlog_version = "1.17.0"; // String expected in system // // Values for all collateral