fix: Follow check-effects-interactions pattern more strictly

aave · Sep 30, 2021 · 7e7980a · 7e7980a
1 parent 9494299
commit 7e7980a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git a/contracts/protocol/configuration/PoolAddressesProvider.sol b/contracts/protocol/configuration/PoolAddressesProvider.sol
@@ -141,8 +141,8 @@ contract PoolAddressesProvider is Ownable, IPoolAddressesProvider {
 
     if (proxyAddress == address(0)) {
       proxy = new InitializableImmutableAdminUpgradeabilityProxy(address(this));
-      proxy.initialize(newAddress, params);
       _addresses[id] = address(proxy);
+      proxy.initialize(newAddress, params);
       emit ProxyCreated(id, address(proxy));
     } else {
       proxy.upgradeToAndCall(newAddress, params);

diff --git a/contracts/protocol/pool/Pool.sol b/contracts/protocol/pool/Pool.sol
@@ -396,9 +396,9 @@ contract Pool is VersionedInitializable, IPool, PoolStorage {
       if (accruedToTreasury != 0) {
         uint256 normalizedIncome = reserve.getNormalizedIncome();
         uint256 amountToMint = accruedToTreasury.rayMul(normalizedIncome);
+        reserve.accruedToTreasury = 0;
         IAToken(reserve.aTokenAddress).mintToTreasury(amountToMint, normalizedIncome);
 
-        reserve.accruedToTreasury = 0;
         emit MintedToTreasury(assetAddress, amountToMint);
       }
     }

diff --git a/contracts/protocol/tokenization/AToken.sol b/contracts/protocol/tokenization/AToken.sol
@@ -117,14 +117,14 @@ contract AToken is
     uint256 accumulatedInterest = scaledBalance.rayMul(index) -
       scaledBalance.rayMul(_userState[user].additionalData);
 
+    _userState[user].additionalData = Helpers.castUint128(index);
+
     _burn(user, Helpers.castUint128(amountScaled));
 
     if (receiverOfUnderlying != address(this)) {
       IERC20(_underlyingAsset).safeTransfer(receiverOfUnderlying, amount);
     }
 
-    _userState[user].additionalData = Helpers.castUint128(index);
-
     emit Transfer(user, address(0), amount);
     if (accumulatedInterest > amount) {
       emit Mint(user, accumulatedInterest - amount, index);
@@ -146,10 +146,10 @@ contract AToken is
     uint256 accumulatedInterest = scaledBalance.rayMul(index) -
       scaledBalance.rayMul(_userState[user].additionalData);
 
-    _mint(user, Helpers.castUint128(amountScaled));
-
     _userState[user].additionalData = Helpers.castUint128(index);
 
+    _mint(user, Helpers.castUint128(amountScaled));
+
     emit Transfer(address(0), user, amount);
     emit Mint(user, amount + accumulatedInterest, index);
 

diff --git a/contracts/protocol/tokenization/IncentivizedERC20.sol b/contracts/protocol/tokenization/IncentivizedERC20.sol
@@ -109,8 +109,8 @@ abstract contract IncentivizedERC20 is Context, IERC20, IERC20Detailed {
     uint256 amount
   ) public virtual override returns (bool) {
     uint128 castAmount = Helpers.castUint128(amount);
-    _transfer(sender, recipient, castAmount);
     _approve(sender, _msgSender(), _allowances[sender][_msgSender()] - castAmount);
+    _transfer(sender, recipient, castAmount);
     return true;
   }
 

diff --git a/contracts/protocol/tokenization/VariableDebtToken.sol b/contracts/protocol/tokenization/VariableDebtToken.sol
@@ -107,10 +107,10 @@ contract VariableDebtToken is DebtTokenBase, IVariableDebtToken {
     uint256 accumulatedInterest = scaledBalance.rayMul(index) -
       scaledBalance.rayMul(_userState[user].additionalData);
 
-    _mint(onBehalfOf, Helpers.castUint128(amountScaled));
-
     _userState[user].additionalData = Helpers.castUint128(index);
 
+    _mint(onBehalfOf, Helpers.castUint128(amountScaled));
+
     emit Transfer(address(0), onBehalfOf, amount + accumulatedInterest);
     emit Mint(user, onBehalfOf, amount + accumulatedInterest, index);
 
@@ -127,14 +127,13 @@ contract VariableDebtToken is DebtTokenBase, IVariableDebtToken {
     require(amountScaled != 0, Errors.CT_INVALID_BURN_AMOUNT);
 
     uint256 scaledBalance = super.balanceOf(user);
-
     uint256 accumulatedInterest = scaledBalance.rayMul(index) -
       scaledBalance.rayMul(_userState[user].additionalData);
 
-    _burn(user, Helpers.castUint128(amountScaled));
-
     _userState[user].additionalData = Helpers.castUint128(index);
 
+    _burn(user, Helpers.castUint128(amountScaled));
+
     if (accumulatedInterest > amount) {
       emit Transfer(address(0), user, accumulatedInterest - amount);
       emit Mint(user, user, accumulatedInterest - amount, index);