Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not emit Transfer and Mint events if senderBalanceIncrease is zero on aTokens transfer #745

Merged
merged 1 commit into from
Dec 6, 2022
Merged

Do not emit Transfer and Mint events if senderBalanceIncrease is zero on aTokens transfer #745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions contracts/protocol/tokenization/base/ScaledBalanceTokenBase.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,10 @@ abstract contract ScaledBalanceTokenBase is MintableIncentivizedERC20, IScaledBa

super._transfer(sender, recipient, amount.rayDiv(index).toUint128());

emit Transfer(address(0), sender, senderBalanceIncrease);
emit Mint(_msgSender(), sender, senderBalanceIncrease, senderBalanceIncrease, index);
if (senderBalanceIncrease > 0) {
emit Transfer(address(0), sender, senderBalanceIncrease);
emit Mint(_msgSender(), sender, senderBalanceIncrease, senderBalanceIncrease, index);
}

if (recipientBalanceIncrease > 0) {
emit Transfer(address(0), recipient, recipientBalanceIncrease);
Expand Down
48 changes: 28 additions & 20 deletions test-suites/helpers/utils/tokenization-events.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,18 +216,20 @@ export const transfer = async (
addedScaledBalance,
indexAfter,
]);
matchEvent(rcpt, 'Transfer', aToken, aToken.address, [
ZERO_ADDRESS,
user.address,
fromBalanceIncrease,
]);
matchEvent(rcpt, 'Mint', aToken, aToken.address, [
user.address,
user.address,
fromBalanceIncrease,
fromBalanceIncrease,
indexAfter,
]);
if (fromBalanceIncrease.gt(0)) {
matchEvent(rcpt, 'Transfer', aToken, aToken.address, [
ZERO_ADDRESS,
user.address,
fromBalanceIncrease,
]);
matchEvent(rcpt, 'Mint', aToken, aToken.address, [
user.address,
user.address,
fromBalanceIncrease,
fromBalanceIncrease,
indexAfter,
]);
}
if (toBalanceIncrease.gt(0)) {
matchEvent(rcpt, 'Transfer', aToken, aToken.address, [ZERO_ADDRESS, to, toBalanceIncrease]);
matchEvent(rcpt, 'Mint', aToken, aToken.address, [
Expand Down Expand Up @@ -277,14 +279,20 @@ export const transferFrom = async (
addedScaledBalance,
indexAfter,
]);
matchEvent(rcpt, 'Transfer', aToken, aToken.address, [ZERO_ADDRESS, origin, fromBalanceIncrease]);
matchEvent(rcpt, 'Mint', aToken, aToken.address, [
user.address,
origin,
fromBalanceIncrease,
fromBalanceIncrease,
indexAfter,
]);
if (fromBalanceIncrease.gt(0)) {
matchEvent(rcpt, 'Transfer', aToken, aToken.address, [
ZERO_ADDRESS,
origin,
fromBalanceIncrease,
]);
matchEvent(rcpt, 'Mint', aToken, aToken.address, [
user.address,
origin,
fromBalanceIncrease,
fromBalanceIncrease,
indexAfter,
]);
}
if (toBalanceIncrease.gt(0)) {
matchEvent(rcpt, 'Transfer', aToken, aToken.address, [ZERO_ADDRESS, to, toBalanceIncrease]);
matchEvent(rcpt, 'Mint', aToken, aToken.address, [
Expand Down