Switch from raw ETH to ERC20 #78
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
RickGriff
approved these changes
Mar 31, 2024
| (bool success, ) = address(_activePool).call{value: _amount}(""); | ||
| require(success, "BorrowerOps: Sending ETH to ActivePool failed"); | ||
| function _pullETHAndSendToActivePool(IActivePool _activePool, uint256 _amount) internal { | ||
| // Pull ETH tokens from sender (we may save gas by pulling directly from Active Pool, but then the approval UX for user would be weird) |
There was a problem hiding this comment.
I sort-of remember this from the HP approach, but why would it be weird - because they have to approve a contract (ActivePool) different from the one they are interacting with (BorrowerOperations)?
contracts/src/BoldToken.sol
Outdated
| @@ -298,6 +299,7 @@ contract BoldToken is CheckContract, IBoldToken { | |||
| return _VERSION; | |||
| } | |||
|
|
|||
| // TODO: Do we need this? | |||
| function permitTypeHash() external pure override returns (bytes32) { | |||
There was a problem hiding this comment.
I guess we don't need the external function.
| @@ -1158,7 +1158,7 @@ contract TroveManager is LiquityBase, Ownable, CheckContract, ITroveManager { | |||
| // Transfer coll and debt from ActivePool to DefaultPool | |||
| _activePool.decreaseBoldDebt(_debt); | |||
| _defaultPool.increaseBoldDebt(_debt); | |||
| _activePool.sendETH(address(_defaultPool), _coll); | |||
| _activePool.sendETHToDefaultPool(_coll); | |||
There was a problem hiding this comment.
Wow, surprisingly few changes in TroveManager! Nice
| // import "forge-std/console.sol"; | ||
|
|
||
|
|
||
| contract NonPayable { |
There was a problem hiding this comment.
Nitpick, but it seems it's not always "NonPayable" - maybe we can rename? "NonPayableSwitch" or something?
| await defaultPool.setAddresses(mockTroveManager.address, mockActivePool.address) | ||
| }) | ||
|
|
||
| it('sendETHToActivePool(): fails if receiver cannot receive ETH', async () => { |
There was a problem hiding this comment.
Is this one now redundant?
There was a problem hiding this comment.
Yes, as now it’s not raw ETH, it doesn’t matter if the receiver is payable or not.
| @@ -896,6 +903,32 @@ class TestHelper { | |||
| }; | |||
| } | |||
|
|
|||
| static async openTroveWrapper( | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Updated ETH flows diagram:
Closes #73