Skip to content

Add Safe Transfer #12

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

Merged
Joeysantoro merged 2 commits into from
Jan 30, 2021
Merged

Add Safe Transfer #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49cf61a
Add safe transfer
Jan 28, 2021
b6500c4
assert weth
Jan 30, 2021
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
2 changes: 1 addition & 1 deletion contracts/pcv/EthUniswapPCVController.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ contract EthUniswapPCVController is IUniswapPCVController, UniRef {

IWETH weth = IWETH(router.WETH());
weth.deposit{value: amount}();
weth.transfer(address(pair), amount);
assert(weth.transfer(address(pair), amount));

(uint amount0Out, uint amount1Out) = pair.token0() == address(weth) ? (uint(0), amountOut) : (amountOut, uint(0));
pair.swap(amount0Out, amount1Out, address(this), new bytes(0));
Expand Down
8 changes: 7 additions & 1 deletion contracts/pool/Pool.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
pragma solidity ^0.6.0;
pragma experimental ABIEncoderV2;

import "@uniswap/lib/contracts/libraries/TransferHelper.sol";
import "@openzeppelin/contracts/utils/SafeCast.sol";
import "@openzeppelin/contracts/token/ERC20/ERC20Burnable.sol";
import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
Expand Down Expand Up @@ -118,7 +119,12 @@ abstract contract Pool is IPool, ERC20, ERC20Burnable, Timed {
require(initialized, "Pool: Uninitialized");
require(amount <= stakedToken.balanceOf(from), "Pool: Balance too low to stake");

stakedToken.transferFrom(from, address(this), amount);
TransferHelper.safeTransferFrom(
address(stakedToken),
from,
address(this),
amount
);

stakedBalance[to] += amount;
_incrementStaked(amount);
Expand Down