cicnet/erc20-pool
5
0
Fork 0
mirror of https://github.com/grassrootseconomics/erc20-pool.git synced 2024-11-22 04:06:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: apply fee after quote. Exclude fees from public liquidity

Browse Source
This commit is contained in:
Mohamed Sohail 2024-03-21 16:57:06 +08:00
parent c38fb552e9
commit ab897bf901
Signed by: kamikazechaser
GPG Key ID: 7DD45520C01CD85D
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -5,3 +5,4 @@ build/
dist/ dist/
solidity/*.json solidity/*.json
solidity/*.bin solidity/*.bin
.venv

21
solidity/SwapPool.sol
View File

@ -137,22 +137,30 @@ contract SwapPool {
function withdraw(address _outToken, address _inToken, uint256 _value) public { function withdraw(address _outToken, address _inToken, uint256 _value) public {
bool r; bool r;
bytes memory v; bytes memory v;
uint256 netValue;
uint256 balance; uint256 balance;
uint256 fee; uint256 fee;
uint256 outValue;
uint256 trueBalance;
fee = getFee(_value); outValue = getQuote(_outToken, _inToken, _value);
netValue = _value - fee;
netValue = getQuote(_outToken, _inToken, netValue);
(r, v) = _outToken.call(abi.encodeWithSignature("balanceOf(address)", this)); (r, v) = _outToken.call(abi.encodeWithSignature("balanceOf(address)", this));
require(r, "ERR_TOKEN"); require(r, "ERR_TOKEN");
balance = abi.decode(v, (uint256)); balance = abi.decode(v, (uint256));
require(balance >= netValue + fee, "ERR_BALANCE");
// unwithdrawn fees should remain untouched
trueBalance = balance - fees[_outToken];
// deduct the fees from the quoted outValue
fee = getFee(outValue);
outValue -= fee;
// pool should have enough balance to cover the final outValue (fees already deducted)
require(balance >= outValue, "ERR_BALANCE");
deposit(_inToken, _value); deposit(_inToken, _value);
(r, v) = _outToken.call(abi.encodeWithSignature('transfer(address,uint256)', msg.sender, netValue)); (r, v) = _outToken.call(abi.encodeWithSignature('transfer(address,uint256)', msg.sender, outValue));
require(r, "ERR_TOKEN"); require(r, "ERR_TOKEN");
r = abi.decode(v, (bool)); r = abi.decode(v, (bool));
require(r, "ERR_TRANSFER"); require(r, "ERR_TRANSFER");
@ -235,3 +243,4 @@ contract SwapPool {
return false; return false;
} }
} }