Skip to content
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.

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

Remove override interface implementations #4315

Merged
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
4daab31
AccessControl
RenanSouza2 Jun 5, 2023
ebf635c
AccessControlEnumerable
RenanSouza2 Jun 5, 2023
7a0466f
Governor
RenanSouza2 Jun 5, 2023
f377dd4
IGovernor
RenanSouza2 Jun 5, 2023
6b50b81
TimelockController
RenanSouza2 Jun 5, 2023
bec26fc
Votes
RenanSouza2 Jun 5, 2023
17401ed
ERC1271WalletMock
RenanSouza2 Jun 5, 2023
8db131c
ERC3156FlashBorrowerMock
RenanSouza2 Jun 5, 2023
5d29695
ERC20VotesLegacyMock
RenanSouza2 Jun 5, 2023
75cb14f
ERC721ReceiverMock
RenanSouza2 Jun 5, 2023
92dad67
ERC1155ReceiverMock
RenanSouza2 Jun 5, 2023
f20a8d1
UpgradeableBeacon
RenanSouza2 Jun 5, 2023
86519c3
UUPSUpgradeable
RenanSouza2 Jun 5, 2023
88e9853
ERC2981
RenanSouza2 Jun 5, 2023
cdf8b1d
ERC1155
RenanSouza2 Jun 5, 2023
4326964
ERC20
RenanSouza2 Jun 5, 2023
320a0c2
ERC20FlashMint
RenanSouza2 Jun 5, 2023
5da5221
ERC20Permit
RenanSouza2 Jun 5, 2023
9fb85db
ERC4626
RenanSouza2 Jun 5, 2023
8cc7431
ERC721
RenanSouza2 Jun 5, 2023
ff241a8
ERC721Enumerable
RenanSouza2 Jun 5, 2023
da12258
ERC721Wrapper
RenanSouza2 Jun 5, 2023
6ee337d
ERC721Holder
RenanSouza2 Jun 5, 2023
3cdda53
EIP712
RenanSouza2 Jun 5, 2023
307c154
EIP165
RenanSouza2 Jun 5, 2023
1372aeb
Recover comments
RenanSouza2 Jun 5, 2023
ac0a4b2
Add changeset
RenanSouza2 Jun 5, 2023
13b211b
Fix changeset
RenanSouza2 Jun 6, 2023
e6d8ee1
Update .changeset/violet-dancers-cough.md
ernestognw Jun 6, 2023
52229bf
Merge remote-tracking branch 'upstream/master' into remove-override-i…
RenanSouza2 Jun 6, 2023
6ab19df
Merge branch 'master' into remove-override-interface-implementations
RenanSouza2 Jun 6, 2023
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
Prev Previous commit
Next Next commit
ERC20FlashMint
  • Loading branch information
RenanSouza2 committed Jun 5, 2023
commit 320a0c2322f23a30bc4c45ddba95b9385a37a1d0
6 changes: 3 additions & 3 deletions contracts/token/ERC20/extensions/ERC20FlashMint.sol
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ abstract contract ERC20FlashMint is ERC20, IERC3156FlashLender {
* @param token The address of the token that is requested.
* @return The amount of token that can be loaned.
*/
function maxFlashLoan(address token) public view virtual override returns (uint256) {
function maxFlashLoan(address token) public view virtual returns (uint256) {
return token == address(this) ? type(uint256).max - totalSupply() : 0;
}

Expand All @@ -36,7 +36,7 @@ abstract contract ERC20FlashMint is ERC20, IERC3156FlashLender {
* @param amount The amount of tokens to be loaned.
* @return The fees applied to the corresponding flash loan.
*/
function flashFee(address token, uint256 amount) public view virtual override returns (uint256) {
function flashFee(address token, uint256 amount) public view virtual returns (uint256) {
require(token == address(this), "ERC20FlashMint: wrong token");
return _flashFee(token, amount);
}
Expand Down Expand Up @@ -88,7 +88,7 @@ abstract contract ERC20FlashMint is ERC20, IERC3156FlashLender {
address token,
uint256 amount,
bytes calldata data
) public virtual override returns (bool) {
) public virtual returns (bool) {
require(amount <= maxFlashLoan(token), "ERC20FlashMint: amount exceeds maxFlashLoan");
uint256 fee = flashFee(token, amount);
_mint(address(receiver), amount);
Expand Down