Fix owneronly for settings

contracts/ConsumerHost.sol

@@ -149,6 +149,9 @@ contract ConsumerHost is Initializable, OwnableUpgradeable, IConsumer, ERC165, S
      * @param controller The address of controller account, consumer to set
      */
     function setControllerAccount(address controller) external {
+        _requireNotBlacklisted(settings, msg.sender);
+        _requireNotBlacklisted(settings, controller);
+
         controllers[msg.sender] = controller;
 
         emit SetControllerAccount(msg.sender, controller);
@@ -158,6 +161,8 @@ contract ConsumerHost is Initializable, OwnableUpgradeable, IConsumer, ERC165, S
      * @notice consumer call to remove the controller account.
      */
     function removeControllerAccount() public {
+        _requireNotBlacklisted(settings, msg.sender);
+
         address controller = controllers[msg.sender];
         delete controllers[msg.sender];
 
@@ -221,6 +226,8 @@ contract ConsumerHost is Initializable, OwnableUpgradeable, IConsumer, ERC165, S
      * @notice Approve host can use consumer balance
      */
     function approve() external {
+        _requireNotBlacklisted(settings, msg.sender);
+
         require(
             !(IEraManager(settings.getContractAddress(SQContracts.EraManager)).maintenance()),
             'G019'
@@ -234,6 +241,8 @@ contract ConsumerHost is Initializable, OwnableUpgradeable, IConsumer, ERC165, S
      * @notice Disapprove host can use consumer balance
      */
     function disapprove() external {
+        _requireNotBlacklisted(settings, msg.sender);
+
         require(
             !(IEraManager(settings.getContractAddress(SQContracts.EraManager)).maintenance()),
             'G019'
@@ -249,6 +258,8 @@ contract ConsumerHost is Initializable, OwnableUpgradeable, IConsumer, ERC165, S
      * @param isApprove approve consumer host agent to act on user's behalf
      */
     function deposit(uint256 amount, bool isApprove) external {
+        _requireNotBlacklisted(settings, msg.sender);
+
         require(
             !(IEraManager(settings.getContractAddress(SQContracts.EraManager)).maintenance()),
             'G019'
@@ -273,6 +284,9 @@ contract ConsumerHost is Initializable, OwnableUpgradeable, IConsumer, ERC165, S
      * @param _for account
      */
     function depositFor(uint256 _amount, address _for) external {
+        _requireNotBlacklisted(settings, msg.sender);
+        _requireNotBlacklisted(settings, _for);
+
         require(
             !(IEraManager(settings.getContractAddress(SQContracts.EraManager)).maintenance()),
             'G019'
@@ -292,6 +306,8 @@ contract ConsumerHost is Initializable, OwnableUpgradeable, IConsumer, ERC165, S
      * @param amount the amount
      */
     function withdraw(uint256 amount) external {
+        _requireNotBlacklisted(settings, msg.sender);
+
         require(
             !(IEraManager(settings.getContractAddress(SQContracts.EraManager)).maintenance()),
             'G019'
@@ -320,6 +336,9 @@ contract ConsumerHost is Initializable, OwnableUpgradeable, IConsumer, ERC165, S
     ) external {
         require(msg.sender == settings.getContractAddress(SQContracts.StateChannel), 'G011');
         (address consumer, bytes memory sign) = abi.decode(callback, (address, bytes));
+        _requireNotBlacklisted(settings, consumer);
+        _requireNotBlacklisted(settings, sender);
+
         if (channels[channelId] == address(0)) {
             channels[channelId] = consumer;
         } else {
@@ -364,6 +383,7 @@ contract ConsumerHost is Initializable, OwnableUpgradeable, IConsumer, ERC165, S
         require(msg.sender == settings.getContractAddress(SQContracts.StateChannel), 'G011');
 
         address consumer = channels[channelId];
+        _requireNotBlacklisted(settings, consumer);
         Consumer storage info = consumers[consumer];
         info.balance += amount;
 
@@ -428,6 +448,7 @@ contract ConsumerHost is Initializable, OwnableUpgradeable, IConsumer, ERC165, S
         require(msg.sender == settings.getContractAddress(SQContracts.StateChannel), 'G011');
         address consumer;
         (consumer, ) = this.decodeConsumerCallback(callback);
+        _requireNotBlacklisted(settings, consumer);
         channels[channelId] = consumer;
     }
 

contracts/RewardsBooster.sol

@@ -122,6 +122,8 @@ contract RewardsBooster is Initializable, OwnableUpgradeable, IRewardsBooster, S
     /// @dev MODIFIER
     /// @notice only consumer or its controller can call
     modifier consumerAuthorised(address consumer) {
+        _requireNotBlacklisted(settings, consumer);
+
         if (msg.sender != consumer) {
             bool isController = IConsumerRegistry(
                 settings.getContractAddress(SQContracts.ConsumerRegistry)
@@ -236,6 +238,8 @@ contract RewardsBooster is Initializable, OwnableUpgradeable, IRewardsBooster, S
         bytes32 _deploymentId,
         uint256 _amount
     ) external onlyRegisteredDeployment(_deploymentId) {
+        _requireNotBlacklisted(settings, msg.sender);
+
         // migrate deployment pool
         ProjectType projectType = migrateDeploymentBoost(_deploymentId, msg.sender);
 
@@ -277,6 +281,8 @@ contract RewardsBooster is Initializable, OwnableUpgradeable, IRewardsBooster, S
      * @param _amount the added amount
      */
     function removeBoosterDeployment(bytes32 _deploymentId, uint256 _amount) external {
+        _requireNotBlacklisted(settings, msg.sender);
+
         // migrate deployment pool
         ProjectType projectType = migrateDeploymentBoost(_deploymentId, msg.sender);
         require(
@@ -288,6 +294,15 @@ contract RewardsBooster is Initializable, OwnableUpgradeable, IRewardsBooster, S
         IERC20(settings.getContractAddress(SQContracts.SQToken)).safeTransfer(msg.sender, _amount);
     }
 
+    function adminRemoveBoosterDeployment(
+        bytes32 _deploymentId,
+        address _account,
+        uint256 _amount
+    ) external onlyOwner {
+        ProjectType projectType = migrateDeploymentBoost(_deploymentId, _account);
+        _removeBoosterDeployment(projectType, _deploymentId, _account, _amount);
+    }
+
     /**
      * @notice swap booster from one deployment to another
      * @param account the account booster the deployments
@@ -979,6 +994,8 @@ contract RewardsBooster is Initializable, OwnableUpgradeable, IRewardsBooster, S
     }
 
     function collectAllocationReward(bytes32 _deploymentId, address _runner) external override {
+        _requireNotBlacklisted(settings, _runner);
+
         IIndexerRegistry indexerRegistry = IIndexerRegistry(
             ISettings(settings).getContractAddress(SQContracts.IndexerRegistry)
         );
@@ -1317,10 +1334,17 @@ contract RewardsBooster is Initializable, OwnableUpgradeable, IRewardsBooster, S
     function spendQueryRewards(
         bytes32 _deploymentId,
         address _spender,
+        address _runner,
         uint256 _amount,
         bytes calldata _data
     ) external override returns (uint256) {
         require(msg.sender == settings.getContractAddress(SQContracts.StateChannel), 'RB006');
+        _requireNotBlacklisted(settings, _spender);
+        require(
+            IProjectRegistry(settings.getContractAddress(SQContracts.ProjectRegistry))
+                .isDeploymentRegistered(_deploymentId),
+            'RB052'
+        );
         migrateDeploymentBoost(_deploymentId, _spender);
 
         uint256 spend1 = _spendQueryRewards(_deploymentId, _spender, _amount, _data);

contracts/RewardsDistributor.sol

@@ -197,6 +197,9 @@ contract RewardsDistributor is IRewardsDistributor, Initializable, OwnableUpgrad
             settings.getContractAddress(SQContracts.ServiceAgreementRegistry)
         ).getClosedServiceAgreement(agreementId);
         require(agreement.consumer != address(0), 'SA001');
+        _requireNotBlacklisted(settings, agreement.consumer);
+        _requireNotBlacklisted(settings, agreement.indexer);
+
         IEraManager eraManager = IEraManager(settings.getContractAddress(SQContracts.EraManager));
 
         address runner = agreement.indexer;
@@ -303,6 +306,10 @@ contract RewardsDistributor is IRewardsDistributor, Initializable, OwnableUpgrad
         uint256 amount,
         uint256 era
     ) external {
+        _requireNotBlacklisted(settings, msg.sender);
+        _requireNotBlacklisted(settings, sender);
+        _requireNotBlacklisted(settings, runner);
+
         require(era <= _getCurrentEra(), 'RD001');
         require(era >= info[runner].lastClaimEra, 'RD002');
         IERC20(settings.getContractAddress(SQContracts.SQToken)).safeTransferFrom(
@@ -328,6 +335,8 @@ contract RewardsDistributor is IRewardsDistributor, Initializable, OwnableUpgrad
      * @notice check if the current Era is claimed.
      */
     function collectAndDistributeRewards(address runner) public {
+        _requireNotBlacklisted(settings, runner);
+
         // check current era is after lastClaimEra
         uint256 currentEra = _getCurrentEra();
         require(info[runner].lastClaimEra < currentEra - 1, 'RD003');
@@ -343,6 +352,8 @@ contract RewardsDistributor is IRewardsDistributor, Initializable, OwnableUpgrad
         uint256 currentEra,
         address runner
     ) public returns (uint256) {
+        _requireNotBlacklisted(settings, runner);
+
         RewardInfo storage rewardInfo = info[runner];
         require(rewardInfo.lastClaimEra > 0, 'RD004');
         // skip when it has been claimed for currentEra - 1, no throws
@@ -429,13 +440,18 @@ contract RewardsDistributor is IRewardsDistributor, Initializable, OwnableUpgrad
      * @notice Claim rewards of msg.sender for specific runner.
      */
     function claim(address runner) public {
+        _requireNotBlacklisted(settings, msg.sender);
+
         require(claimFrom(runner, msg.sender) > 0, 'RD007');
     }
 
     /**
      * @notice Claculate the Rewards for user and tranfrer token to user.
      */
     function claimFrom(address runner, address user) public returns (uint256) {
+        _requireNotBlacklisted(settings, msg.sender);
+        _requireNotBlacklisted(settings, user);
+
         require(
             !(IEraManager(settings.getContractAddress(SQContracts.EraManager)).maintenance()),
             'G019'
@@ -451,6 +467,10 @@ contract RewardsDistributor is IRewardsDistributor, Initializable, OwnableUpgrad
     }
 
     function claimForDelegate(address runner, address user) public returns (uint256) {
+        _requireNotBlacklisted(settings, msg.sender);
+        _requireNotBlacklisted(settings, user);
+        _requireNotBlacklisted(settings, runner);
+
         require(
             !(IEraManager(settings.getContractAddress(SQContracts.EraManager)).maintenance()),
             'G019'

contracts/RewardsPool.sol

@@ -150,6 +150,8 @@ contract RewardsPool is IRewardsPool, Initializable, OwnableUpgradeable, SQParam
      * @param amount the labor of services
      */
     function labor(bytes32 deploymentId, address runner, uint256 amount) external {
+        _requireNotBlacklisted(settings, runner);
+
         require(amount > 0, 'RP002');
         IERC20(settings.getContractAddress(SQContracts.SQToken)).safeTransferFrom(
             msg.sender,
@@ -210,6 +212,8 @@ contract RewardsPool is IRewardsPool, Initializable, OwnableUpgradeable, SQParam
      * @param runner runner address
      */
     function collect(bytes32 deploymentId, address runner) external {
+        _requireNotBlacklisted(settings, runner);
+
         uint256 currentEra = IEraManager(settings.getContractAddress(SQContracts.EraManager))
             .safeUpdateAndGetEra();
         _collect(currentEra - 1, deploymentId, runner);
@@ -220,6 +224,8 @@ contract RewardsPool is IRewardsPool, Initializable, OwnableUpgradeable, SQParam
      * @param runner runner address
      */
     function batchCollect(address runner) external {
+        _requireNotBlacklisted(settings, runner);
+
         uint256 currentEra = IEraManager(settings.getContractAddress(SQContracts.EraManager))
             .safeUpdateAndGetEra();
         _batchCollect(currentEra - 1, runner);
@@ -232,6 +238,8 @@ contract RewardsPool is IRewardsPool, Initializable, OwnableUpgradeable, SQParam
      * @param runner runner address
      */
     function collectEra(uint256 era, bytes32 deploymentId, address runner) external {
+        _requireNotBlacklisted(settings, runner);
+
         uint256 currentEra = IEraManager(settings.getContractAddress(SQContracts.EraManager))
             .safeUpdateAndGetEra();
         require(currentEra > era, 'RP004');
@@ -244,6 +252,8 @@ contract RewardsPool is IRewardsPool, Initializable, OwnableUpgradeable, SQParam
      * @param runner runner address
      */
     function batchCollectEra(uint256 era, address runner) external {
+        _requireNotBlacklisted(settings, runner);
+
         uint256 currentEra = IEraManager(settings.getContractAddress(SQContracts.EraManager))
             .safeUpdateAndGetEra();
         require(currentEra > era, 'RP004');

contracts/RewardsStaking.sol

@@ -19,6 +19,7 @@ import './interfaces/IStakingAllocation.sol';
 import './interfaces/IIndexerRegistry.sol';
 import './Constants.sol';
 import './utils/MathUtil.sol';
+import './utils/SQParameter.sol';
 
 /**
  * @title Rewards Staking Contract
@@ -39,7 +40,7 @@ import './utils/MathUtil.sol';
  * 2. These management functions are permissionless, so delegators can call them on runner's behalf so they can remove their delegation from the runner.
  *
  */
-contract RewardsStaking is IRewardsStaking, Initializable, OwnableUpgradeable {
+contract RewardsStaking is IRewardsStaking, Initializable, OwnableUpgradeable, SQParameter {
     using SafeERC20 for IERC20;
     using MathUtil for uint256;
 
@@ -144,6 +145,9 @@ contract RewardsStaking is IRewardsStaking, Initializable, OwnableUpgradeable {
      * Last era's reward need to be collected before this can pass.
      */
     function onStakeChange(address _runner, address _source) external onlyStaking {
+        _requireNotBlacklisted(settings, _runner);
+        _requireNotBlacklisted(settings, _source);
+
         uint256 currentEra = _getCurrentEra();
         uint256 lastEra = currentEra - 1;
 
@@ -228,6 +232,8 @@ contract RewardsStaking is IRewardsStaking, Initializable, OwnableUpgradeable {
      * Last era's reward need to be collected before this can pass.
      */
     function onICRChange(address runner, uint256 startEra) external onlyIndexerRegistry {
+        _requireNotBlacklisted(settings, runner);
+
         uint256 currentEra = _getCurrentEra();
         require(startEra > currentEra, 'RS004');
 
@@ -246,6 +252,8 @@ contract RewardsStaking is IRewardsStaking, Initializable, OwnableUpgradeable {
      * @dev Apply the stake change and calaulate the new rewardDebt for staker.
      */
     function applyStakeChange(address runner, address staker) external {
+        _requireNotBlacklisted(settings, staker);
+
         IRewardsDistributor rewardsDistributor = _getRewardsDistributor();
         IndexerRewardInfo memory rewardInfo = rewardsDistributor.getRewardInfo(runner);
         uint256 lastClaimEra = rewardInfo.lastClaimEra;
@@ -294,6 +302,9 @@ contract RewardsStaking is IRewardsStaking, Initializable, OwnableUpgradeable {
     }
 
     function applyRedelegation(address runner, address staker) external onlyStakingManager {
+        _requireNotBlacklisted(settings, runner);
+        _requireNotBlacklisted(settings, staker);
+
         IRewardsDistributor rewardsDistributor = _getRewardsDistributor();
         IndexerRewardInfo memory rewardInfo = rewardsDistributor.getRewardInfo(runner);
         uint256 currentEra = _getCurrentEra();
@@ -338,6 +349,8 @@ contract RewardsStaking is IRewardsStaking, Initializable, OwnableUpgradeable {
      * @dev Apply the CommissionRate change and update the commissionRates stored in contract states.
      */
     function applyICRChange(address runner) external {
+        _requireNotBlacklisted(settings, runner);
+
         uint256 currentEra = _getCurrentEra();
         require(
             pendingCommissionRateChange[runner] != 0 &&
@@ -397,6 +410,8 @@ contract RewardsStaking is IRewardsStaking, Initializable, OwnableUpgradeable {
      * Require to be true when someone try to claimRewards() or onStakeChangeRequested().
      */
     function applyRunnerWeightChange(address _runner) public {
+        _requireNotBlacklisted(settings, _runner);
+
         uint256 _runnerStakeWeight = runnerStakeWeight();
         uint256 _previousRunnerStakeWeight = previousRunnerStakeWeight(_runner);
         if (_runnerStakeWeight != _previousRunnerStakeWeight) {

contracts/Settings.sol

@@ -9,23 +9,46 @@ import './interfaces/ISettings.sol';
 
 contract Settings is ISettings, Initializable, OwnableUpgradeable {
     mapping(SQContracts => address) public contractAddresses;
+    mapping(address => bool) private walletBlacklist;
 
     function initialize() external initializer {
         __Ownable_init();
     }
 
-    function setContractAddress(SQContracts sq, address _address) public {
+    function setContractAddress(SQContracts sq, address _address) public onlyOwner {
         contractAddresses[sq] = _address;
     }
 
     function getContractAddress(SQContracts sq) public view returns (address) {
         return contractAddresses[sq];
     }
 
-    function setBatchAddress(SQContracts[] calldata _sq, address[] calldata _address) external {
+    function setBatchAddress(
+        SQContracts[] calldata _sq,
+        address[] calldata _address
+    ) external onlyOwner {
         require(_sq.length == _address.length, 'ST001');
         for (uint256 i = 0; i < _sq.length; i++) {
             contractAddresses[_sq[i]] = _address[i];
         }
     }
+
+    function setWalletBlacklisted(address wallet, bool blacklisted) external onlyOwner {
+        walletBlacklist[wallet] = blacklisted;
+        emit WalletBlacklistUpdated(wallet, blacklisted);
+    }
+
+    function setWalletBlacklistedBatch(
+        address[] calldata wallets,
+        bool blacklisted
+    ) external onlyOwner {
+        for (uint256 i = 0; i < wallets.length; i++) {
+            walletBlacklist[wallets[i]] = blacklisted;
+            emit WalletBlacklistUpdated(wallets[i], blacklisted);
+        }
+    }
+
+    function isWalletBlacklisted(address wallet) external view returns (bool) {
+        return walletBlacklist[wallet];
+    }
 }