Skip to content
Merged
Show file tree
Hide file tree
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
Recover comments
  • Loading branch information
RenanSouza2 committed Jun 5, 2023
commit 1372aeb91bf1c1d6fee9b8e2cdb885c70948f76b
2 changes: 1 addition & 1 deletion contracts/token/ERC20/ERC20.sol
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import "../../utils/Context.sol";
* https://forum.openzeppelin.com/t/how-to-implement-erc20-supply-mechanisms/226[How
* to implement supply mechanisms].
*
* The default value of {decimals} is 18. To change this, you should
* The default value of {decimals} is 18. To change this, you should override
* this function so it returns a different value.
*
* We have followed general OpenZeppelin Contracts guidelines: functions revert
Expand Down
2 changes: 1 addition & 1 deletion contracts/token/ERC20/extensions/ERC4626.sol
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import "../../../utils/math/Math.sol";
* The drawback of this approach is that the virtual shares do capture (a very small) part of the value being accrued
* to the vault. Also, if the vault experiences losses, the users try to exit the vault, the virtual shares and assets
* will cause the first user to exit to experience reduced losses in detriment to the last users that will experience
* bigger losses. Developers willing to revert back to the pre-v4.9 behavior just need to the
* bigger losses. Developers willing to revert back to the pre-v4.9 behavior just need to override the
* `_convertToShares` and `_convertToAssets` functions.
*
* To learn more, check out our xref:ROOT:erc4626.adoc[ERC-4626 guide].
Expand Down
6 changes: 3 additions & 3 deletions contracts/token/ERC721/ERC721.sol
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ contract ERC721 is Context, ERC165, IERC721, IERC721Metadata {
// Clear approvals
delete _tokenApprovals[tokenId];

// Decrease balance with checked arithmetic, because an `ownerOf` may
// Decrease balance with checked arithmetic, because an `ownerOf` override may
// invalidate the assumption that `_balances[from] >= 1`.
_balances[owner] -= 1;

Expand Down Expand Up @@ -339,7 +339,7 @@ contract ERC721 is Context, ERC165, IERC721, IERC721Metadata {
// Clear approvals from the previous owner
delete _tokenApprovals[tokenId];

// Decrease balance with checked arithmetic, because an `ownerOf` may
// Decrease balance with checked arithmetic, because an `ownerOf` override may
// invalidate the assumption that `_balances[from] >= 1`.
_balances[from] -= 1;

Expand Down Expand Up @@ -451,7 +451,7 @@ contract ERC721 is Context, ERC165, IERC721, IERC721Metadata {
function _afterTokenTransfer(address from, address to, uint256 firstTokenId, uint256 batchSize) internal virtual {}

/**
* @dev Unsafe write access to the balances, used by extensions that "mint" tokens using an {ownerOf} .
* @dev Unsafe write access to the balances, used by extensions that "mint" tokens using an {ownerOf} override.
*
* WARNING: Anyone calling this MUST ensure that the balances remain consistent with the ownership. The invariant
* being that for any address `a` the value returned by `balanceOf(a)` must be equal to the number of tokens such
Expand Down
2 changes: 1 addition & 1 deletion contracts/token/common/ERC2981.sol
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ abstract contract ERC2981 is IERC2981, ERC165 {
/**
* @dev The denominator with which to interpret the fee set in {_setTokenRoyalty} and {_setDefaultRoyalty} as a
* fraction of the sale price. Defaults to 10000 so fees are expressed in basis points, but may be customized by an
* .
* override.
*/
function _feeDenominator() internal pure virtual returns (uint96) {
return 10000;
Expand Down