Merge pull request #153 from 1inch/feature/curve-oracle/blacklist

[SC-1160] Blacklist in CurveOracle
1inch · Jun 25, 2024 · a3092c2 · a3092c2
2 parents 7993139 + 1402e6b
commit a3092c2
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 7 deletions.
diff --git a/contracts/helpers/Blacklist.sol b/contracts/helpers/Blacklist.sol
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity 0.8.23;
+
+import "@openzeppelin/contracts/access/Ownable.sol";
+
+contract Blacklist is Ownable {
+    event BlacklistUpdated(address pool, bool isBlacklisted);
+
+    mapping(address => bool) public blacklisted;
+
+    constructor(address[] memory initialBlacklist, address owner) Ownable(owner) {
+        for (uint256 i = 0; i < initialBlacklist.length; i++) {
+            blacklisted[initialBlacklist[i]] = true;
+        }
+    }
+
+    function toggleBlacklistAddress(address pool) external onlyOwner {
+        blacklisted[pool] = !blacklisted[pool];
+        emit BlacklistUpdated(pool, blacklisted[pool]);
+    }
+}
diff --git a/contracts/oracles/CurveOracle.sol b/contracts/oracles/CurveOracle.sol
@@ -9,8 +9,9 @@ import "../interfaces/ICurveProvider.sol";
 import "../interfaces/ICurveRegistry.sol";
 import "../interfaces/ICurveSwap.sol";
 import "../libraries/OraclePrices.sol";
+import "../helpers/Blacklist.sol";
 
-contract CurveOracle is IOracle {
+contract CurveOracle is IOracle, Blacklist {
     using OraclePrices for OraclePrices.Data;
     using Math for uint256;
 
@@ -40,7 +41,14 @@ contract CurveOracle is IOracle {
     ICurveRegistry[11] public registries;
     CurveRegistryType[11] public registryTypes;
 
-    constructor(ICurveProvider _addressProvider, uint256 _maxPools, uint256[] memory _registryIds, CurveRegistryType[] memory _registryTypes) {
+    constructor(
+        ICurveProvider _addressProvider,
+        uint256 _maxPools,
+        uint256[] memory _registryIds,
+        CurveRegistryType[] memory _registryTypes,
+        address[] memory initialBlacklist,
+        address owner
+    ) Blacklist(initialBlacklist, owner) {
         MAX_POOLS = _maxPools;
         REGISTRIES_COUNT = _registryIds.length;
         unchecked {
@@ -61,6 +69,10 @@ contract CurveOracle is IOracle {
             uint256 registryIndex = 0;
             address pool = registries[i].find_pool_for_coins(address(srcToken), address(dstToken), registryIndex);
             while (pool != address(0) && index < MAX_POOLS) {
+                if (blacklisted[pool]) {
+                    pool = registries[i].find_pool_for_coins(address(srcToken), address(dstToken), ++registryIndex);
+                    continue;
+                }
                 index++;
                 // call `get_coin_indices` and set (srcTokenIndex, dstTokenIndex, isUnderlying) variables
                 bool isUnderlying;

diff --git a/hardhat.config.js b/hardhat.config.js
@@ -37,7 +37,7 @@ module.exports = {
         deploy: 'deploy/commands',
     },
     mocha: {
-        timeout: 120000,
+        timeout: 180000,
     },
     tracer: {
         enableAllOpcodes: true,

diff --git a/test/Blacklist.js b/test/Blacklist.js
@@ -0,0 +1,25 @@
+const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
+const { ethers } = require('hardhat');
+const { expect, deployContract } = require('@1inch/solidity-utils');
+const { tokens } = require('./helpers.js');
+
+describe('Blacklist', function () {
+    async function initContracts () {
+        const [owner, alice] = await ethers.getSigners();
+        const blacklist = await deployContract('Blacklist', [[], owner]);
+        return { owner, alice, blacklist };
+    }
+
+    it('should revert by non-owner', async function () {
+        const { alice, blacklist } = await loadFixture(initContracts);
+        await expect(blacklist.connect(alice).toggleBlacklistAddress(tokens.ETH)).to.be.revertedWithCustomError(blacklist, 'OwnableUnauthorizedAccount');
+    });
+
+    it('should toggle record state', async function () {
+        const { owner, blacklist } = await loadFixture(initContracts);
+        await blacklist.connect(owner).toggleBlacklistAddress(tokens.ETH);
+        expect(await blacklist.blacklisted(tokens.ETH)).to.be.true;
+        await blacklist.connect(owner).toggleBlacklistAddress(tokens.ETH);
+        expect(await blacklist.blacklisted(tokens.ETH)).to.be.false;
+    });
+});
diff --git a/test/oracles/CurveOracle.js b/test/oracles/CurveOracle.js
@@ -1,6 +1,6 @@
 const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
 const { ethers } = require('hardhat');
-const { expect, deployContract } = require('@1inch/solidity-utils');
+const { expect, deployContract, constants } = require('@1inch/solidity-utils');
 const {
     tokens,
     deployParams: { AaveWrapperV2, Curve, Uniswap, UniswapV2, UniswapV3 },
@@ -12,7 +12,7 @@ const {
 
 describe('CurveOracle', function () {
     async function initContracts () {
-        const curveOracle = await deployContract('CurveOracle', [Curve.provider, Curve.maxPools, Curve.registryIds, Curve.registryTypes]);
+        const curveOracle = await deployContract('CurveOracle', [Curve.provider, Curve.maxPools, Curve.registryIds, Curve.registryTypes, [], constants.EEE_ADDRESS]);
         const uniswapV3Oracle = await deployContract('UniswapV3LikeOracle', [UniswapV3.factory, UniswapV3.initcodeHash, UniswapV3.fees]);
         return { curveOracle, uniswapV3Oracle };
     }
@@ -107,7 +107,9 @@ describe('CurveOracle', function () {
                 },
             ];
 
-            const curveOracle = await deployContract('CurveOracle', [Curve.provider, Curve.maxPools, [Curve.registryIds[registryIndex]], [Curve.registryTypes[registryIndex]]]);
+            const curveOracle = await deployContract('CurveOracle', [
+                Curve.provider, Curve.maxPools, [Curve.registryIds[registryIndex]], [Curve.registryTypes[registryIndex]], [], constants.EEE_ADDRESS,
+            ]);
             const curveProvider = await ethers.getContractAt('ICurveProvider', Curve.provider);
             const registryAddress = await curveProvider.get_address(Curve.registryIds[registryIndex]);
             const registry = await ethers.getContractAt('ICurveRegistry', registryAddress);
@@ -141,7 +143,7 @@ describe('CurveOracle', function () {
             const [deployer] = await ethers.getSigners();
 
             const uniswapV2LikeOracle = await deployContract('UniswapV2LikeOracle', [UniswapV2.factory, UniswapV2.initcodeHash]);
-            const curveOracle = await deployContract('CurveOracle', [Curve.provider, Curve.maxPools, Curve.registryIds, Curve.registryTypes]);
+            const curveOracle = await deployContract('CurveOracle', [Curve.provider, Curve.maxPools, Curve.registryIds, Curve.registryTypes, [], constants.EEE_ADDRESS]);
             const uniswapOracle = await deployContract('UniswapOracle', [Uniswap.factory]);
             const mooniswapOracle = await deployContract('MooniswapOracle', [tokens.oneInchLP1]);
             const wethWrapper = await deployContract('BaseCoinWrapper', [tokens.ETH, tokens.WETH]);