Router settle with balance #235
Conversation
| @@ -27,7 +27,11 @@ contract V4RouterImplementation is V4Router, ReentrancyLock { | |||
| } | |||
|
|
|||
| function _pay(Currency token, address payer, uint256 amount) internal override { | |||
| ERC20(Currency.unwrap(token)).safeTransferFrom(payer, address(poolManager), amount); | |||
| if (payer == address(this)) { | |||
| ERC20(Currency.unwrap(token)).safeTransfer(address(poolManager), amount); | |||
There was a problem hiding this comment.
why not use currency.transfer from currency library?
There was a problem hiding this comment.
🤷♀️ its a test so didnt think about it tbh, will do it now
There was a problem hiding this comment.
done! i also moved this contract to /mocks and deleted /implementations
| @@ -27,7 +28,11 @@ contract V4RouterImplementation is V4Router, ReentrancyLock { | |||
| } | |||
|
|
|||
| function _pay(Currency token, address payer, uint256 amount) internal override { | |||
| ERC20(Currency.unwrap(token)).safeTransferFrom(payer, address(poolManager), amount); | |||
| if (payer == address(this)) { | |||
| token.transfer(address(poolManager), amount); | |||
There was a problem hiding this comment.
so I think we both have the same problem in pay where by this point (if its been called from DeltaResolver) it definitely wont be NATIVE currency, but we still check if its native inside currency. I wonder if we should write a currency.transferERC20() without that native check.. anyways food for thought.
There was a problem hiding this comment.
this contract is actually just a mock for tests - in the universal router (where i implement _pay) it doesnt check if its ETH. But its a good thought for posm
| _settle(currency, _msgSender(), amount); | ||
| _settle(currency, _msgSender(), _getFullSettleAmount(currency)); | ||
| } else if (action == Actions.SETTLE_WITH_BALANCE) { | ||
| Currency currency = params.decodeCurrency(); |
There was a problem hiding this comment.
i like how you do this here, Im going to change posm to do this as well
Allow settle to be funds from the router