Fix audit report (#7)

* [CRITICAL] Fix lastDateSync * [LOW] Prevent duplicated governor * [INFO] Fix test
axieinfinity · May 14, 2022 · 6cd7240 · 6cd7240
1 parent c09ef25
commit 6cd7240
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/contracts/v0.8/common/RoninValidator.sol b/contracts/v0.8/common/RoninValidator.sol
@@ -268,6 +268,7 @@ contract RoninValidator is Initializable, IWeightedValidator, HasProxyAdmin {
         _totalWeights += _v.weight;
 
         if (_governors[_i] != _v.governor) {
+          require(_governorWeight[_v.governor] == 0, "RoninValidator: query for duplicated governor");
           delete _governorWeight[_governors[_i]];
           _governors[_i] = _v.governor;
         }

diff --git a/contracts/v0.8/extensions/WithdrawalLimitation.sol b/contracts/v0.8/extensions/WithdrawalLimitation.sol
@@ -26,8 +26,8 @@ abstract contract WithdrawalLimitation is HasProxyAdmin {
   mapping(address => uint256) public dailyWithdrawalLimit;
   /// @dev Mapping from token address => today withdrawal amount
   mapping(address => uint256) public lastSyncedWithdrawal;
-  /// @dev Last date synced to record the `lastSyncedWithdrawal`
-  uint256 public lastDateSynced;
+  /// @dev Mapping from token address => last date synced to record the `lastSyncedWithdrawal`
+  mapping(address => uint256) public lastDateSynced;
 
   /**
    * @dev Sets the thresholds for withdrawals that requires all validator signatures.
@@ -187,7 +187,7 @@ abstract contract WithdrawalLimitation is HasProxyAdmin {
     }
 
     uint256 _currentDate = block.timestamp / 1 days;
-    if (_currentDate > lastDateSynced) {
+    if (_currentDate > lastDateSynced[_token]) {
       return dailyWithdrawalLimit[_token] <= _quantity;
     } else {
       return dailyWithdrawalLimit[_token] <= lastSyncedWithdrawal[_token] + _quantity;
@@ -199,8 +199,8 @@ abstract contract WithdrawalLimitation is HasProxyAdmin {
    */
   function _recordWithdrawal(address _token, uint256 _quantity) internal virtual {
     uint256 _currentDate = block.timestamp / 1 days;
-    if (_currentDate > lastDateSynced) {
-      lastDateSynced = _currentDate;
+    if (_currentDate > lastDateSynced[_token]) {
+      lastDateSynced[_token] = _currentDate;
       lastSyncedWithdrawal[_token] = _quantity;
     } else {
       lastSyncedWithdrawal[_token] += _quantity;

diff --git a/test/v0.8/mainchain/MainchainGatewayV2.test.ts b/test/v0.8/mainchain/MainchainGatewayV2.test.ts
@@ -101,7 +101,7 @@ describe('Mainchain Gateway V2 test', () => {
     await erc20.addMinters([deployer.address]);
     erc721 = await new MockERC721__factory(deployer).deploy('ERC721', 'ERC721', '');
 
-    if ((network.name = Network.Hardhat)) {
+    if (network.name == Network.Hardhat) {
       validatorSet[network.name] = validators.map((v, i) => ({
         validator: v.address,
         governor: governors[i].address,
@@ -401,7 +401,7 @@ describe('Mainchain Gateway V2 test', () => {
       expect(receipt.gasUsed).lt(60_000);
     });
 
-    it('Should be able to deposit empty amount', async () => {
+    it('Should not be able to deposit empty amount', async () => {
       await expect(
         normalUser.sendTransaction({
           to: gateway.address,