Skip to content
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

[WIP]add risk admin role for configurator #96

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

[WIP]add risk admin role for configurator #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81339a4
add risk admin role for configurator
thorseldon Mar 13, 2023
e3f5fcd
support both risk and pool admin
thorseldon Mar 23, 2023
01377b6
updating configurator on goerli
thorseldon Mar 23, 2023
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: 2 additions & 0 deletions contracts/libraries/helpers/Errors.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ library Errors {
string public constant INVALID_FROM_BALANCE_AFTER_TRANSFER = "102";
string public constant INVALID_TO_BALANCE_AFTER_TRANSFER = "103";
string public constant CALLER_NOT_ONBEHALFOF_OR_IN_WHITELIST = "104";
string public constant CALLER_NOT_RISK_ADMIN = "105";
string public constant CALLER_NOT_RISK_OR_POOL_ADMIN = "106";

//math library erros
string public constant MATH_MULTIPLICATION_OVERFLOW = "200";
Expand Down
1 change: 1 addition & 0 deletions contracts/protocol/LendPoolAddressesProvider.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ contract LendPoolAddressesProvider is Ownable, ILendPoolAddressesProvider {
bytes32 private constant BEND_DATA_PROVIDER = "BEND_DATA_PROVIDER";
bytes32 private constant UI_DATA_PROVIDER = "UI_DATA_PROVIDER";
bytes32 private constant WALLET_BALANCE_PROVIDER = "WALLET_BALANCE_PROVIDER";
bytes32 public constant RISK_ADMIN = "RISK_ADMIN";

constructor(string memory marketId) {
_setMarketId(marketId);
Expand Down
17 changes: 13 additions & 4 deletions contracts/protocol/LendPoolConfigurator.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ contract LendPoolConfigurator is Initializable, ILendPoolConfigurator {
using NftConfiguration for DataTypes.NftConfigurationMap;

ILendPoolAddressesProvider internal _addressesProvider;
bytes32 public constant RISK_ADMIN = "RISK_ADMIN";

modifier onlyPoolAdmin() {
require(_addressesProvider.getPoolAdmin() == msg.sender, Errors.CALLER_NOT_POOL_ADMIN);
Expand All @@ -41,6 +42,14 @@ contract LendPoolConfigurator is Initializable, ILendPoolConfigurator {
_;
}

modifier onlyRiskOrPoolAdmin() {
require(
(_addressesProvider.getAddress(RISK_ADMIN) == msg.sender) || (_addressesProvider.getPoolAdmin() == msg.sender),
Errors.CALLER_NOT_RISK_OR_POOL_ADMIN
);
_;
}

function initialize(ILendPoolAddressesProvider provider) public initializer {
_addressesProvider = provider;
}
Expand Down Expand Up @@ -86,7 +95,7 @@ contract LendPoolConfigurator is Initializable, ILendPoolConfigurator {
}
}

function setBorrowingFlagOnReserve(address[] calldata assets, bool flag) external onlyPoolAdmin {
function setBorrowingFlagOnReserve(address[] calldata assets, bool flag) external onlyRiskOrPoolAdmin {
ILendPool cachedPool = _getLendPool();
for (uint256 i = 0; i < assets.length; i++) {
DataTypes.ReserveConfigurationMap memory currentConfig = cachedPool.getReserveConfiguration(assets[i]);
Expand Down Expand Up @@ -126,7 +135,7 @@ contract LendPoolConfigurator is Initializable, ILendPoolConfigurator {
}
}

function setFreezeFlagOnReserve(address[] calldata assets, bool flag) external onlyPoolAdmin {
function setFreezeFlagOnReserve(address[] calldata assets, bool flag) external onlyRiskOrPoolAdmin {
ILendPool cachedPool = _getLendPool();
for (uint256 i = 0; i < assets.length; i++) {
DataTypes.ReserveConfigurationMap memory currentConfig = cachedPool.getReserveConfiguration(assets[i]);
Expand Down Expand Up @@ -205,7 +214,7 @@ contract LendPoolConfigurator is Initializable, ILendPoolConfigurator {
}
}

function setFreezeFlagOnNft(address[] calldata assets, bool flag) external onlyPoolAdmin {
function setFreezeFlagOnNft(address[] calldata assets, bool flag) external onlyRiskOrPoolAdmin {
ILendPool cachedPool = _getLendPool();
for (uint256 i = 0; i < assets.length; i++) {
DataTypes.NftConfigurationMap memory currentConfig = cachedPool.getNftConfiguration(assets[i]);
Expand Down Expand Up @@ -322,7 +331,7 @@ contract LendPoolConfigurator is Initializable, ILendPoolConfigurator {
address[] calldata assets,
uint256 maxSupply,
uint256 maxTokenId
) external onlyPoolAdmin {
) external onlyRiskOrPoolAdmin {
ILendPool cachedPool = _getLendPool();
for (uint256 i = 0; i < assets.length; i++) {
cachedPool.setNftMaxSupplyAndTokenId(assets[i], maxSupply, maxTokenId);
Expand Down
4 changes: 2 additions & 2 deletions deployments/deployed-contracts-goerli.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"deployer": "0xafF5C36642385b6c7Aaf7585eC785aB2316b5db6"
},
"ConfiguratorLogic": {
"address": "0x1580A5E24B0c80c6DDd93225F1D11B62AEA0EC2d",
"address": "0x935429b4eADc941d3af30F431844f86057242bDc",
"deployer": "0xafF5C36642385b6c7Aaf7585eC785aB2316b5db6"
},
"LendPoolImpl": {
Expand All @@ -65,7 +65,7 @@
"address": "0x7F64c32a3c13Bd245a7141a607A7E60DA585BA86"
},
"LendPoolConfiguratorImpl": {
"address": "0x1e53E338C7f6Eb1F9c70E30C369ed41782635344"
"address": "0x5F7Ae7Bb12712109500d9E4484170dE3A06eDd54"
},
"LendPoolConfigurator": {
"address": "0x365661b853845F90b2b5B28a1A61bE5c54aE9FB2"
Expand Down
2 changes: 2 additions & 0 deletions helpers/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ export enum ProtocolErrors {
INVALID_FROM_BALANCE_AFTER_TRANSFER = "102",
INVALID_TO_BALANCE_AFTER_TRANSFER = "103",
CALLER_NOT_ONBEHALFOF_OR_IN_WHITELIST = "104",
CALLER_NOT_RISK_ADMIN = "105",
CALLER_NOT_RISK_OR_POOL_ADMIN = "106",

//math library erros
MATH_MULTIPLICATION_OVERFLOW = "200",
Expand Down
1 change: 1 addition & 0 deletions test/__setup.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
const addressesProvider = await deployLendPoolAddressesProvider(BendConfig.MarketId);
await waitForTx(await addressesProvider.setPoolAdmin(poolAdmin));
await waitForTx(await addressesProvider.setEmergencyAdmin(emergencyAdmin));
await waitForTx(await addressesProvider.setAddress(await addressesProvider.RISK_ADMIN(), poolAdmin));

await waitForTx(
await addressesProviderRegistry.registerAddressesProvider(addressesProvider.address, BendConfig.ProviderId)
Expand Down
24 changes: 12 additions & 12 deletions test/configurator-nft.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ makeSuite("Configurator-NFT", (testEnv: TestEnv) => {
expect(isActive).to.be.equal(true);
});

it("Check the onlyAdmin on deactivateRNft ", async () => {
it("Check the onlyPoolAdmin on deactivateRNft ", async () => {
const { configurator, users, bayc } = testEnv;
await expect(
configurator.connect(users[2].signer).setActiveFlagOnNft([bayc.address], false),
CALLER_NOT_POOL_ADMIN
).to.be.revertedWith(CALLER_NOT_POOL_ADMIN);
});

it("Check the onlyAdmin on activateNft ", async () => {
it("Check the onlyPoolAdmin on activateNft ", async () => {
const { configurator, users, bayc } = testEnv;
await expect(
configurator.connect(users[2].signer).setActiveFlagOnNft([bayc.address], true),
Expand Down Expand Up @@ -93,15 +93,15 @@ makeSuite("Configurator-NFT", (testEnv: TestEnv) => {
await expect(
configurator.connect(users[2].signer).setFreezeFlagOnNft([bayc.address], true),
CALLER_NOT_POOL_ADMIN
).to.be.revertedWith(CALLER_NOT_POOL_ADMIN);
).to.be.revertedWith(ProtocolErrors.CALLER_NOT_RISK_OR_POOL_ADMIN);
});

it("Check the onlyAdmin on unfreezeNft ", async () => {
const { configurator, users, bayc } = testEnv;
await expect(
configurator.connect(users[2].signer).setFreezeFlagOnNft([bayc.address], false),
CALLER_NOT_POOL_ADMIN
).to.be.revertedWith(CALLER_NOT_POOL_ADMIN);
).to.be.revertedWith(ProtocolErrors.CALLER_NOT_RISK_OR_POOL_ADMIN);
});

it("Deactivates the BAYC NFT as collateral", async () => {
Expand All @@ -126,7 +126,7 @@ makeSuite("Configurator-NFT", (testEnv: TestEnv) => {
expect(liquidationBonus).to.be.equal(500);
});

it("Check the onlyAdmin on configureNftAsCollateral ", async () => {
it("Check the onlyPoolAdmin on configureNftAsCollateral ", async () => {
const { configurator, users, bayc } = testEnv;
await expect(
configurator.connect(users[2].signer).configureNftAsCollateral([bayc.address], "7500", "8000", "500"),
Expand Down Expand Up @@ -166,7 +166,7 @@ makeSuite("Configurator-NFT", (testEnv: TestEnv) => {
expect(minBidFine).to.be.equal(5000);
});

it("Check the onlyAdmin on configureNftAsAuction ", async () => {
it("Check the onlyPoolAdmin on configureNftAsAuction ", async () => {
const { configurator, users, bayc } = testEnv;
await expect(
configurator.connect(users[2].signer).configureNftAsAuction([bayc.address], "1", "1", "100"),
Expand Down Expand Up @@ -216,7 +216,7 @@ makeSuite("Configurator-NFT", (testEnv: TestEnv) => {
expect(liquidationBonus).to.be.equal(500);
});

it("Check the onlyAdmin on batchConfigNft ", async () => {
it("Check the onlyPoolAdmin on batchConfigNft ", async () => {
const { configurator, users, bayc } = testEnv;
await expect(
configurator.connect(users[2].signer).batchConfigNft(cfgInputParams),
Expand Down Expand Up @@ -303,7 +303,7 @@ makeSuite("Configurator-NFT", (testEnv: TestEnv) => {
);
});

it("Check the onlyAdmin on setMaxNumberOfNfts ", async () => {
it("Check the onlyPoolAdmin on setMaxNumberOfNfts ", async () => {
const { configurator, users, pool } = testEnv;
await expect(
configurator.connect(users[2].signer).setMaxNumberOfNfts(512),
Expand All @@ -325,15 +325,15 @@ makeSuite("Configurator-NFT", (testEnv: TestEnv) => {
expect(wantVal2).to.be.equal(false);
});

it("Check the onlyAdmin on approve interceptor ", async () => {
it("Check the onlyPoolAdmin on approve interceptor ", async () => {
const { configurator, users, pool } = testEnv;
await expect(
configurator.connect(users[2].signer).approveLoanRepaidInterceptor(pool.address, true),
CALLER_NOT_POOL_ADMIN
).to.be.revertedWith(CALLER_NOT_POOL_ADMIN);
});

it("Check the onlyAdmin on approve interceptor ", async () => {
it("Check the onlyPoolAdmin on approve interceptor ", async () => {
const { configurator, users, pool, bBAYC } = testEnv;
await expect(
configurator.connect(users[2].signer).purgeLoanRepaidInterceptor(bBAYC.address, [100], pool.address),
Expand All @@ -355,15 +355,15 @@ makeSuite("Configurator-NFT", (testEnv: TestEnv) => {
expect(wantVal2).to.be.equal(false);
});

it("Check the onlyAdmin on approve locker ", async () => {
it("Check the onlyPoolAdmin on approve locker ", async () => {
const { configurator, users, pool } = testEnv;
await expect(
configurator.connect(users[2].signer).approveFlashLoanLocker(pool.address, true),
CALLER_NOT_POOL_ADMIN
).to.be.revertedWith(CALLER_NOT_POOL_ADMIN);
});

it("Check the onlyAdmin on approve locker ", async () => {
it("Check the onlyPoolAdmin on approve locker ", async () => {
const { configurator, users, pool, bBAYC } = testEnv;
await expect(
configurator.connect(users[2].signer).purgeFlashLoanLocking(bBAYC.address, [100], pool.address),
Expand Down
14 changes: 7 additions & 7 deletions test/configurator-reserve.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ makeSuite("Configurator-Reserve", (testEnv: TestEnv) => {
expect(isActive).to.be.equal(true);
});

it("Check the onlyAdmin on deactivateReserve ", async () => {
it("Check the onlyPoolAdmin on deactivateReserve ", async () => {
const { configurator, users, weth } = testEnv;
await expect(
configurator.connect(users[2].signer).setActiveFlagOnReserve([weth.address], false),
CALLER_NOT_POOL_ADMIN
).to.be.revertedWith(CALLER_NOT_POOL_ADMIN);
});

it("Check the onlyAdmin on activateReserve ", async () => {
it("Check the onlyPoolAdmin on activateReserve ", async () => {
const { configurator, users, weth } = testEnv;
await expect(
configurator.connect(users[2].signer).setActiveFlagOnReserve([weth.address], true),
Expand Down Expand Up @@ -88,15 +88,15 @@ makeSuite("Configurator-Reserve", (testEnv: TestEnv) => {
await expect(
configurator.connect(users[2].signer).setFreezeFlagOnReserve([weth.address], true),
CALLER_NOT_POOL_ADMIN
).to.be.revertedWith(CALLER_NOT_POOL_ADMIN);
).to.be.revertedWith(ProtocolErrors.CALLER_NOT_RISK_OR_POOL_ADMIN);
});

it("Check the onlyAdmin on unfreezeReserve ", async () => {
const { configurator, users, weth } = testEnv;
await expect(
configurator.connect(users[2].signer).setFreezeFlagOnReserve([weth.address], false),
CALLER_NOT_POOL_ADMIN
).to.be.revertedWith(CALLER_NOT_POOL_ADMIN);
).to.be.revertedWith(ProtocolErrors.CALLER_NOT_RISK_OR_POOL_ADMIN);
});

it("Deactivates the ETH reserve for borrowing", async () => {
Expand Down Expand Up @@ -134,15 +134,15 @@ makeSuite("Configurator-Reserve", (testEnv: TestEnv) => {
await expect(
configurator.connect(users[2].signer).setBorrowingFlagOnReserve([weth.address], false),
CALLER_NOT_POOL_ADMIN
).to.be.revertedWith(CALLER_NOT_POOL_ADMIN);
).to.be.revertedWith(ProtocolErrors.CALLER_NOT_RISK_OR_POOL_ADMIN);
});

it("Check the onlyAdmin on enableBorrowingOnReserve ", async () => {
const { configurator, users, weth } = testEnv;
await expect(
configurator.connect(users[2].signer).setBorrowingFlagOnReserve([weth.address], true),
CALLER_NOT_POOL_ADMIN
).to.be.revertedWith(CALLER_NOT_POOL_ADMIN);
).to.be.revertedWith(ProtocolErrors.CALLER_NOT_RISK_OR_POOL_ADMIN);
});

it("Changes the reserve factor of WETH", async () => {
Expand Down Expand Up @@ -239,7 +239,7 @@ makeSuite("Configurator-Reserve", (testEnv: TestEnv) => {
);
});

it("Check the onlyAdmin on setMaxNumberOfReserves ", async () => {
it("Check the onlyPoolAdmin on setMaxNumberOfReserves ", async () => {
const { configurator, users, pool } = testEnv;
await expect(
configurator.connect(users[2].signer).setMaxNumberOfReserves(512),
Expand Down