fix: naming consistency and stable debt event fix

aave · Dec 1, 2021 · 7f17123 · 7f17123
1 parent 87fc0bb
commit 7f17123
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/contracts/protocol/tokenization/AToken.sol b/contracts/protocol/tokenization/AToken.sol
@@ -103,13 +103,13 @@ contract AToken is VersionedInitializable, IncentivizedERC20, IAToken {
     }
 
     if (balanceIncrease > amount) {
-      uint256 netAmount = balanceIncrease - amount;
-      emit Transfer(address(0), user, netAmount);
-      emit Mint(user, netAmount, balanceIncrease, index);
+      uint256 amountToMint = balanceIncrease - amount;
+      emit Transfer(address(0), user, amountToMint);
+      emit Mint(user, amountToMint, balanceIncrease, index);
     } else {
-      uint256 netAmount = amount - balanceIncrease;
-      emit Transfer(user, address(0), netAmount);
-      emit Burn(user, receiverOfUnderlying, netAmount, balanceIncrease, index);
+      uint256 amountToBurn = amount - balanceIncrease;
+      emit Transfer(user, address(0), amountToBurn);
+      emit Burn(user, receiverOfUnderlying, amountToBurn, balanceIncrease, index);
     }
   }
 

diff --git a/contracts/protocol/tokenization/StableDebtToken.sol b/contracts/protocol/tokenization/StableDebtToken.sol
@@ -150,13 +150,14 @@ contract StableDebtToken is IStableDebtToken, DebtTokenBase {
         rate.rayMul(vars.amountInRay)).rayDiv(vars.nextSupply.wadToRay())
     );
 
+    uint256 amountToMint = amount + balanceIncrease;
     _mint(onBehalfOf, amount + balanceIncrease, vars.previousSupply);
 
-    emit Transfer(address(0), onBehalfOf, amount + balanceIncrease);
+    emit Transfer(address(0), onBehalfOf, amountToMint);
     emit Mint(
       user,
       onBehalfOf,
-      amount,
+      amountToMint,
       currentBalance,
       balanceIncrease,
       vars.nextStableRate,

diff --git a/test-suites/stable-debt-token.spec.ts b/test-suites/stable-debt-token.spec.ts
@@ -161,14 +161,15 @@ makeSuite('StableDebtToken', (testEnv: TestEnv) => {
         .borrow(usdc.address, borrowOnBehalfAmount, RateMode.Stable, 0, user1.address)
     );
 
-    const afterDebtBalanceUser2 = await stableDebtToken.balanceOf(user2.address);
     const afterDebtBalanceUser1 = await stableDebtToken.balanceOf(user1.address);
 
     // Calculate debt + interests
     const expectedDebtIncreaseUser1 = afterDebtBalanceUser1.sub(
       borrowOnBehalfAmount.add(borrowAmount)
     );
 
+    console.log(`expectedDebtIncreaseUser1 : ${expectedDebtIncreaseUser1}`);
+
     const transferEventSig = utils.keccak256(
       utils.toUtf8Bytes('Transfer(address,address,uint256)')
     );
@@ -189,9 +190,8 @@ makeSuite('StableDebtToken', (testEnv: TestEnv) => {
     ).args;
 
     expect(expectedDebtIncreaseUser1.add(borrowOnBehalfAmount)).to.be.eq(transferAmount);
-    expect(borrowOnBehalfAmount).to.be.eq(mintAmount);
+    expect(borrowOnBehalfAmount.add(balanceIncrease)).to.be.eq(mintAmount);
     expect(expectedDebtIncreaseUser1).to.be.eq(balanceIncrease);
-    expect(afterDebtBalanceUser2.sub(beforeDebtBalanceUser2)).to.be.lt(transferAmount);
 
     await evmRevert(snapId);
   });