Skip to content
This repository has been archived by the owner on Aug 30, 2024. It is now read-only.

tiny refactoring #41

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
22 changes: 13 additions & 9 deletions contracts/XPToken.sol
Original file line number Diff line number Diff line change
Expand Up @@ -91,16 +91,20 @@ contract XPToken is XTokenBase, IERC20, XApollo {
address dst,
uint256 amt
) external returns (bool) {
require(
msg.sender == src || amt <= _allowance[src][msg.sender],
"ERR_BTOKEN_BAD_CALLER"
);
_move(src, dst, amt);
if (msg.sender != src && _allowance[src][msg.sender] != uint256(-1)) {
_allowance[src][msg.sender] = (_allowance[src][msg.sender]).bsub(
amt
if (msg.sender == src) {
_move(src, dst, amt);
} else {
require(
amt <= _allowance[src][msg.sender],
"ERR_BTOKEN_BAD_CALLER"
);
emit Approval(msg.sender, dst, _allowance[src][msg.sender]);
_move(src, dst, amt);
if (_allowance[src][msg.sender] != uint256(-1)) {
_allowance[src][msg.sender] = (_allowance[src][msg.sender]).bsub(
amt
);
emit Approval(msg.sender, dst, _allowance[src][msg.sender]);
}
}
return true;
}
Expand Down