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

feat: add Deposit and Collect events

Browse Source 
* refactor public deposit function: the internal function doesn't emit an event when called within withdraw
This commit is contained in:
Mohamed Sohail 2024-04-08 12:48:27 +08:00
parent 6d82807ffe
commit d244cc05ec
Signed by: kamikazechaser
GPG Key ID: 7DD45520C01CD85D
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
solidity/SwapPool.sol
View File

@ -38,14 +38,28 @@ contract SwapPool {
// Swap // Swap
event Swap( event Swap(
address indexed initiator, address indexed initiator,
address indexed tokenIn, address indexed tokenIn,
address tokenOut, address tokenOut,
uint256 amountIn, uint256 amountIn,
uint256 amountOut, uint256 amountOut,
uint256 fee uint256 fee
); );
// Deposit
event Deposit(
address indexed initator,
address indexed tokenIn,
uint256 amountIn
);
// Collect
event Collect(
address indexed feeAdress,
address tokenOut,
uint256 amountOut
);
constructor(string memory _name, string memory _symbol, uint8 _decimals, address _tokenRegistry, address _tokenLimiter) { constructor(string memory _name, string memory _symbol, uint8 _decimals, address _tokenRegistry, address _tokenLimiter) {
name = _name; name = _name;
symbol = _symbol; symbol = _symbol;
@ -106,6 +120,11 @@ contract SwapPool {
} }
function deposit(address _token, uint256 _value) public { function deposit(address _token, uint256 _value) public {
_deposit(_token, _value);
emit Deposit(msg.sender, _token, _value);
}
function _deposit(address _token, uint256 _value) private {
bool r; bool r;
bytes memory v; bytes memory v;
@ -164,7 +183,7 @@ contract SwapPool {
// pool should have enough balance to cover the final outValue (fees already deducted) // pool should have enough balance to cover the final outValue (fees already deducted)
require(balance >= outValue, "ERR_BALANCE"); require(balance >= outValue, "ERR_BALANCE");
deposit(_inToken, _value); _deposit(_inToken, _value);
(r, v) = _outToken.call(abi.encodeWithSignature('transfer(address,uint256)', msg.sender, outValue)); (r, v) = _outToken.call(abi.encodeWithSignature('transfer(address,uint256)', msg.sender, outValue));
require(r, "ERR_TOKEN"); require(r, "ERR_TOKEN");
@ -199,6 +218,7 @@ contract SwapPool {
r = abi.decode(v, (bool)); r = abi.decode(v, (bool));
require(r, "ERR_TRANSFER"); require(r, "ERR_TRANSFER");
emit Collect(feeAddress, _outToken, _value);
return _value; return _value;
} }