Merge pull request #23 from fei-protocol/POZ-Move-Incentives-After-Tx

Joeysantoro · web-flow · commit 131b61d5a6ec · 2021-02-06T11:58:56.000-08:00
Move Incentives to After Transfer
diff --git a/contracts/token/Fei.sol b/contracts/token/Fei.sol
@@ -56,11 +56,9 @@ contract Fei is IFei, ERC20, ERC20Burnable, CoreRef {
         emit Burning(account, msg.sender, amount);
     }
 
-    function _beforeTokenTransfer(address from, address to, uint amount) internal override {
-        // If not minting or burning
-        if (from != address(0) && to != address(0)) {
-            _checkAndApplyIncentives(from, to, amount);      
-        }
+    function _transfer(address sender, address recipient, uint256 amount) internal override {
+        super._transfer(sender, recipient, amount);
+        _checkAndApplyIncentives(sender, recipient, amount);
     }
 
     function _checkAndApplyIncentives(address sender, address recipient, uint amount) internal {
diff --git a/test/token/UniswapIncentive.test.js b/test/token/UniswapIncentive.test.js
@@ -270,6 +270,7 @@ describe('UniswapIncentive', function () {
     describe('Sell', function() {
       describe('not allowed seller', function() {
         it('reverts', async function() {
+          await this.fei.mint(secondUserAddress, 1000000, {from: minterAddress});
           await expectRevert(this.fei.transfer(this.pair.address, 500000, {from: secondUserAddress}), "UniswapIncentive: Blocked Fei sender or operator");
         });
       });

Original file line number	Diff line number	Diff line change
`@@ -56,11 +56,9 @@ contract Fei is IFei, ERC20, ERC20Burnable, CoreRef {`
`56`	`56`	`emit Burning(account, msg.sender, amount);`
`57`	`57`	`}`
`58`	`58`
`59`		`- function _beforeTokenTransfer(address from, address to, uint amount) internal override {`
`60`		`- // If not minting or burning`
`61`		`- if (from != address(0) && to != address(0)) {`
`62`		`- _checkAndApplyIncentives(from, to, amount);`
`63`		`- }`
	`59`	`+ function _transfer(address sender, address recipient, uint256 amount) internal override {`
	`60`	`+ super._transfer(sender, recipient, amount);`
	`61`	`+ _checkAndApplyIncentives(sender, recipient, amount);`
`64`	`62`	`}`
`65`	`63`
`66`	`64`	`function _checkAndApplyIncentives(address sender, address recipient, uint amount) internal {`