Merge branch 'SMR-1677-FlowRate' of https://github.com/immutable/zkev…

…m-bridge-contracts into SMR-1677-FlowRate
immutable · Nov 19, 2023 · e774fec · e774fec
2 parents b90de74 + 9316428
commit e774fec
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 9 deletions.
diff --git a/src/interfaces/root/flowrate/IFlowRateWithdrawalQueue.sol b/src/interfaces/root/flowrate/IFlowRateWithdrawalQueue.sol
@@ -22,12 +22,12 @@ interface IFlowRateWithdrawalQueueEvents {
         uint256 index
     );
 
-    // Indicates that the new withdrawal delay.
+    // Indicates the new withdrawal delay.
     event WithdrawalDelayUpdated(uint256 delay, uint256 previousDelay);
 }
 
 interface IFlowRateWithdrawalQueueErrors {
-    // // A withdrawal was being processed, but the index is outside of the array.
+    // A withdrawal was being processed, but the index is outside of the array.
     error IndexOutsideWithdrawalQueue(uint256 lengthOfQueue, uint256 requestedIndex);
 
     // A withdrawal was being processed, but the withdrawal is not yet available.

diff --git a/src/root/RootERC20Bridge.sol b/src/root/RootERC20Bridge.sol
@@ -5,7 +5,6 @@ import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol
 import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
 import {Address} from "@openzeppelin/contracts/utils/Address.sol";
 import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
-// import {Ownable2Step} from "@openzeppelin/contracts/access/Ownable2Step.sol";
 import "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol";
 import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
 import {IAxelarGateway} from "@axelar-cgp-solidity/contracts/interfaces/IAxelarGateway.sol";
@@ -30,8 +29,6 @@ import {BridgeRoles} from "../common/BridgeRoles.sol";
  * @dev Note that there is undefined behaviour for bridging non-standard ERC20 tokens (e.g. rebasing tokens). Please approach such cases with great care.
  */
 contract RootERC20Bridge is
-    AccessControlUpgradeable, // AccessControlUpgradeable inherits Initializable
-    PausableUpgradeable,
     IRootERC20Bridge,
     IRootERC20BridgeEvents,
     IRootERC20BridgeErrors,

diff --git a/src/root/flowrate/FlowRateDetection.sol b/src/root/flowrate/FlowRateDetection.sol
@@ -17,7 +17,7 @@ abstract contract FlowRateDetection {
     // Holds flow rate information for a single token.
     struct Bucket {
         // The number of tokens that can fit in the bucket.
-        // A capacity of zero indicates that flow rate detection is disabled for the token.
+        // A capacity of zero indicates that flow rate detection is not configured for the token.
         uint256 capacity;
         // The number of tokens in the bucket.
         uint256 depth;

diff --git a/test/unit/root/flowrate/RootERC20BridgeFlowRate.t.sol b/test/unit/root/flowrate/RootERC20BridgeFlowRate.t.sol
@@ -82,8 +82,6 @@ contract RootERC20BridgeFlowRateUnitTest is
     address constant IMX_TOKEN = address(0xccc);
     address constant NATIVE_ETH = address(0xeee);
     address constant WRAPPED_ETH = address(0xddd);
-    uint256 constant mapTokenFee = 300;
-    uint256 constant depositFee = 200;
     uint256 constant UNLIMITED_IMX_DEPOSITS = 0;
 
     uint256 constant CAPACITY = 1000000;
@@ -95,7 +93,6 @@ contract RootERC20BridgeFlowRateUnitTest is
     uint256 constant LARGE_ETH = 100000 ether;
 
     uint256 constant CHARLIE_REMAINDER = 17;
-    uint256 constant CHARLIE_REMAINDER_ETH = 17 ether;
     uint256 constant BANK_OF_CHARLIE_TREASURY = BRIDGED_VALUE + CHARLIE_REMAINDER;
 
     uint256 constant BRIDGED_VALUE = CAPACITY * 100;