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.

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

feat: prevent duplicate collateral tokens #903

Merged
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
28 changes: 25 additions & 3 deletions packages/contracts/src/dollar/libraries/LibUbiquityPool.sol
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,24 @@ library LibUbiquityPool {
return poolStorage.collateralAddresses;
}

/**
* @notice Check if collateral token with given address already exists
* @param collateralAddress The collateral token address to check
*/
function collateralExists(
address collateralAddress
) internal view returns (bool) {
UbiquityPoolStorage storage poolStorage = ubiquityPoolStorage();
address[] memory collateralAddresses = poolStorage.collateralAddresses;

for (uint256 i = 0; i < collateralAddresses.length; i++) {
if (collateralAddresses[i] == collateralAddress) {
return true;
}
}
return false;
}

/**
* @notice Returns collateral information
* @param collateralAddress Address of the collateral token
Expand Down Expand Up @@ -533,10 +551,9 @@ library LibUbiquityPool {
// roundId
int256 answer, // startedAt
,
uint256 updatedAt,
uint256 updatedAt, // answeredInRound

) = // answeredInRound
priceFeed.latestRoundData();
) = priceFeed.latestRoundData();

// fetch number of decimals in chainlink feed
uint256 priceFeedDecimals = priceFeed.decimals();
Expand Down Expand Up @@ -631,6 +648,11 @@ library LibUbiquityPool {
address chainLinkPriceFeedAddress,
uint256 poolCeiling
) internal {
require(
!collateralExists(collateralAddress),
"Collateral already added"
);

UbiquityPoolStorage storage poolStorage = ubiquityPoolStorage();

uint256 collateralIndex = poolStorage.collateralAddresses.length;
Expand Down
11 changes: 11 additions & 0 deletions packages/contracts/test/diamond/facets/UbiquityPoolFacet.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -692,6 +692,17 @@ contract UbiquityPoolFacetTest is DiamondTestSetup {
assertEq(info.redemptionFee, 20000);
}

function testAddCollateralToken_ShouldRevertIfCollateralExists() public {
uint256 poolCeiling = 50_000e18;
vm.startPrank(admin);
vm.expectRevert("Collateral already added");
ubiquityPoolFacet.addCollateralToken(
address(collateralToken),
address(collateralTokenPriceFeed),
poolCeiling
);
}

function testRemoveAmoMinter_ShouldRemoveAmoMinter() public {
vm.startPrank(admin);

Expand Down
Loading