address comments

compound-finance · Nov 9, 2023 · ad99f2e · ad99f2e
1 parent b3dbaa3
commit ad99f2e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 15 deletions.
diff --git a/contracts/Comet.sol b/contracts/Comet.sol
@@ -201,7 +201,7 @@ contract Comet is CometMainInterface {
         (asset14_a, asset14_b) = getPackedAssetInternal(config.assetConfigs, 14);
     }
 
-    function _nonReentrantBefore() private {
+    modifier nonReentrant() {
         bytes32 slot = COMET_REENTRANCY_GUARD_FLAG_SLOT;
         uint256 status;
         assembly {
@@ -212,10 +212,7 @@ contract Comet is CometMainInterface {
         assembly {
             sstore(slot, COMET_REENTRANCY_GUARD_ENTERED)
         }
-    }
-
-    function _nonReentrantAfter() private {
-        bytes32 slot = COMET_REENTRANCY_GUARD_FLAG_SLOT;
+        _;
         assembly {
             sstore(slot, COMET_REENTRANCY_GUARD_NOT_ENTERED)
         }
@@ -783,28 +780,24 @@ contract Comet is CometMainInterface {
      * @dev Safe ERC20 transfer in and returns the final amount transferred (taking into account any fees)
      * @dev Note: Safely handles non-standard ERC-20 tokens that do not return a value. See here: https://medium.com/coinmonks/missing-return-value-bug-at-least-130-tokens-affected-d67bf08521ca
      */
-    function doTransferIn(address asset, address from, uint amount) internal returns (uint) {
-        _nonReentrantBefore();
+    function doTransferIn(address asset, address from, uint amount) nonReentrant internal returns (uint) {
         uint256 preTransferBalance = ERC20(asset).balanceOf(address(this));
         (bool success, bytes memory returndata) = asset.call(abi.encodeWithSelector(ERC20.transferFrom.selector, from, address(this), amount));
         if (!success || !(returndata.length == 0 || abi.decode(returndata, (bool)))) {
             revert TransferInFailed();
         }
-        _nonReentrantAfter();
         return ERC20(asset).balanceOf(address(this)) - preTransferBalance;
     }
 
     /**
      * @dev Safe ERC20 transfer out
      * @dev Note: Safely handles non-standard ERC-20 tokens that do not return a value. See here: https://medium.com/coinmonks/missing-return-value-bug-at-least-130-tokens-affected-d67bf08521ca
      */
-    function doTransferOut(address asset, address to, uint amount) internal {
-        _nonReentrantBefore();
+    function doTransferOut(address asset, address to, uint amount) nonReentrant internal {
         (bool success, bytes memory returndata) = asset.call(abi.encodeWithSelector(ERC20.transfer.selector, to, amount));
         if (!success || !(returndata.length == 0 || abi.decode(returndata, (bool)))) {
             revert TransferOutFailed();
         }
-        _nonReentrantAfter();
     }
 
     /**

diff --git a/contracts/CometCore.sol b/contracts/CometCore.sol
@@ -61,7 +61,7 @@ abstract contract CometCore is CometConfiguration, CometStorage, CometMath {
 
     /// @dev The reentrancy guard status
     uint256 internal constant COMET_REENTRANCY_GUARD_NOT_ENTERED = 0;
-    uint256 internal constant COMET_REENTRANCY_GUARD_ENTERED = 2;
+    uint256 internal constant COMET_REENTRANCY_GUARD_ENTERED = 1;
 
     /**
      * @notice Determine if the manager has permission to act on behalf of the owner

diff --git a/test/supply-test.ts b/test/supply-test.ts
@@ -537,7 +537,7 @@ describe('supplyTo', function () {
           decimals: 6,
           initialPrice: 2,
           factory: await ethers.getContractFactory('EvilToken') as EvilToken__factory,
-          supplyCap: 250e6
+          supplyCap: 100e6
         }
       }
     });
@@ -692,7 +692,6 @@ describe('supplyFrom', function () {
     await comet.connect(alice).allow(EVIL.address, true);
     await wait(EVIL.connect(alice).approve(comet.address, 75e6));
     await EVIL.allocateTo(alice.address, 75e6);
-    await comet.connect(alice).supplyTo(bob.address, EVIL.address, 75e6);
-    expect(await comet.collateralBalanceOf(bob.address, EVIL.address)).to.be.revertedWith("custom error 'TransferInFailed()'");
+    await expect(comet.connect(alice).supplyTo(bob.address, EVIL.address, 75e6)).to.be.revertedWith("custom error 'TransferInFailed()'");
   });
 });