diff --git a/lib/aave-helpers b/lib/aave-helpers index 1adaebd6f..fae3da081 160000 --- a/lib/aave-helpers +++ b/lib/aave-helpers @@ -1 +1 @@ -Subproject commit 1adaebd6fe409770e3a2d56560e0127df85b3e2e +Subproject commit fae3da0811f41ecb30da1129976c53d15350b895 diff --git a/src/20231207_AaveV3Ethereum_GhoIncidentReport_20231126/AaveV3Ethereum_GhoIncidentReport_20231113.t.sol b/src/20231207_AaveV3Ethereum_GhoIncidentReport_20231126/AaveV3Ethereum_GhoIncidentReport_20231113.t.sol index dcbfb4659..fb324580d 100644 --- a/src/20231207_AaveV3Ethereum_GhoIncidentReport_20231126/AaveV3Ethereum_GhoIncidentReport_20231113.t.sol +++ b/src/20231207_AaveV3Ethereum_GhoIncidentReport_20231126/AaveV3Ethereum_GhoIncidentReport_20231113.t.sol @@ -28,7 +28,7 @@ contract AaveV3Ethereum_GhoIncidentReport_20231113_Test is ProtocolV3TestBase { function test_defaultProposalExecution() public { // increase GHO borrow cap so test borrows can succeed vm.prank(AaveV3Ethereum.CAPS_PLUS_RISK_STEWARD); - AaveV3Ethereum.POOL_CONFIGURATOR.setBorrowCap(AaveV3Ethereum.GHO_TOKEN, 36_000_000); + AaveV3Ethereum.POOL_CONFIGURATOR.setBorrowCap(AaveV3EthereumAssets.GHO_UNDERLYING, 36_000_000); defaultTest( 'AaveV3Ethereum_GhoIncidentReport_20231113', AaveV3Ethereum.POOL, diff --git a/src/20240119_Gho_GHOStabilityModule/Gho_GHOStabilityModule_20240119.sol b/src/20240119_Gho_GHOStabilityModule/Gho_GHOStabilityModule_20240119.sol index 2f6a4de94..6d946853c 100644 --- a/src/20240119_Gho_GHOStabilityModule/Gho_GHOStabilityModule_20240119.sol +++ b/src/20240119_Gho_GHOStabilityModule/Gho_GHOStabilityModule_20240119.sol @@ -3,6 +3,7 @@ pragma solidity ^0.8.0; import {IProposalGenericExecutor} from 'aave-helpers/interfaces/IProposalGenericExecutor.sol'; import {AaveV3Ethereum, AaveV3EthereumAssets} from 'aave-address-book/AaveV3Ethereum.sol'; +import {MiscEthereum} from 'aave-address-book/MiscEthereum.sol'; import {IERC20} from 'solidity-utils/contracts/oz-common/interfaces/IERC20.sol'; import {SafeERC20} from 'solidity-utils/contracts/oz-common/SafeERC20.sol'; @@ -75,12 +76,12 @@ contract Gho_GHOStabilityModule_20240119 is IProposalGenericExecutor { function execute() external { // 1. Enroll GSMs as GHO Facilitators - IGhoToken(AaveV3Ethereum.GHO_TOKEN).addFacilitator( + IGhoToken(MiscEthereum.GHO_TOKEN).addFacilitator( GSM_USDC, GSM_USDC_FACILITATOR_LABEL, GSM_USDC_BUCKET_CAPACITY ); - IGhoToken(AaveV3Ethereum.GHO_TOKEN).addFacilitator( + IGhoToken(MiscEthereum.GHO_TOKEN).addFacilitator( GSM_USDT, GSM_USDT_FACILITATOR_LABEL, GSM_USDT_BUCKET_CAPACITY diff --git a/src/20240119_Gho_GHOStabilityModule/Gho_GHOStabilityModule_20240119.t.sol b/src/20240119_Gho_GHOStabilityModule/Gho_GHOStabilityModule_20240119.t.sol index 158e3c1f3..cde514067 100644 --- a/src/20240119_Gho_GHOStabilityModule/Gho_GHOStabilityModule_20240119.t.sol +++ b/src/20240119_Gho_GHOStabilityModule/Gho_GHOStabilityModule_20240119.t.sol @@ -3,6 +3,7 @@ pragma solidity ^0.8.0; import 'forge-std/Test.sol'; import {AaveV3EthereumAssets, AaveV3Ethereum} from 'aave-address-book/AaveV3Ethereum.sol'; +import {MiscEthereum} from 'aave-address-book/MiscEthereum.sol'; import {ProtocolV3TestBase} from 'aave-helpers/ProtocolV3TestBase.sol'; import {IPoolConfigurator} from 'aave-address-book/AaveV3.sol'; import {Gho_GHOStabilityModule_20240119} from './Gho_GHOStabilityModule_20240119.sol'; @@ -62,24 +63,24 @@ contract Gho_GHOStabilityModule_20240119_Test is ProtocolV3TestBase { } function test_checkConfig() public { - uint256 facilitatorListLengthBefore = IGhoToken(AaveV3Ethereum.GHO_TOKEN) + uint256 facilitatorListLengthBefore = IGhoToken(MiscEthereum.GHO_TOKEN) .getFacilitatorsList() .length; executePayload(vm, address(proposal)); assertTrue( - IGhoToken(AaveV3Ethereum.GHO_TOKEN).getFacilitatorsList().length == + IGhoToken(MiscEthereum.GHO_TOKEN).getFacilitatorsList().length == facilitatorListLengthBefore + 2 ); - IGhoToken.Facilitator memory gsmUsdc = IGhoToken(AaveV3Ethereum.GHO_TOKEN).getFacilitator( + IGhoToken.Facilitator memory gsmUsdc = IGhoToken(MiscEthereum.GHO_TOKEN).getFacilitator( proposal.GSM_USDC() ); assertEq(gsmUsdc.label, proposal.GSM_USDC_FACILITATOR_LABEL()); assertEq(gsmUsdc.bucketCapacity, proposal.GSM_USDC_BUCKET_CAPACITY()); assertEq(gsmUsdc.bucketLevel, 0); - IGhoToken.Facilitator memory gsmUsdt = IGhoToken(AaveV3Ethereum.GHO_TOKEN).getFacilitator( + IGhoToken.Facilitator memory gsmUsdt = IGhoToken(MiscEthereum.GHO_TOKEN).getFacilitator( proposal.GSM_USDT() ); assertEq(gsmUsdt.label, proposal.GSM_USDT_FACILITATOR_LABEL());