Skip to content

Commit

Permalink
Add virtual to functions
Browse files Browse the repository at this point in the history
  • Loading branch information
@ScreamingHawk
ScreamingHawk committed May 30, 2023
1 parent cb8d0e3 commit 9a9757c
Show file tree
Hide file tree
Showing 6 changed files with 56 additions and 56 deletions.
16 changes: 8 additions & 8 deletions src/contracts/tokens/ERC1155PackedBalanceUpgradeable/ERC1155MetaPackedBalanceUpgradeable.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ contract ERC1155MetaPackedBalanceUpgradeable is ERC1155PackedBalanceUpgradeable,
uint256 _amount,
bool _isGasFee,
bytes memory _data)
public
public virtual
{
require(_to != address(0), "ERC1155MetaPackedBalance#metaSafeTransferFrom: INVALID_RECIPIENT");

Expand Down Expand Up @@ -144,7 +144,7 @@ contract ERC1155MetaPackedBalanceUpgradeable is ERC1155PackedBalanceUpgradeable,
uint256[] memory _amounts,
bool _isGasFee,
bytes memory _data)
public
public virtual
{
require(_to != address(0), "ERC1155MetaPackedBalance#metaSafeBatchTransferFrom: INVALID_RECIPIENT");

Expand Down Expand Up @@ -211,7 +211,7 @@ contract ERC1155MetaPackedBalanceUpgradeable is ERC1155PackedBalanceUpgradeable,
bool _approved,
bool _isGasFee,
bytes memory _data)
public
public virtual
{
// Verify signature and extract the signed data
bytes memory signedData = _signatureValidation(
Expand Down Expand Up @@ -276,7 +276,7 @@ contract ERC1155MetaPackedBalanceUpgradeable is ERC1155PackedBalanceUpgradeable,
address _signer,
bytes memory _sigData,
bytes memory _encMembers)
internal returns (bytes memory signedData)
internal virtual returns (bytes memory signedData)
{
bytes memory sig;

Expand Down Expand Up @@ -314,7 +314,7 @@ contract ERC1155MetaPackedBalanceUpgradeable is ERC1155PackedBalanceUpgradeable,
* @param _signer Address to query signature nonce for
*/
function getNonce(address _signer)
public view returns (uint256 nonce)
public view virtual returns (uint256 nonce)
{
return _getNonce(_signer);
}
Expand All @@ -324,7 +324,7 @@ contract ERC1155MetaPackedBalanceUpgradeable is ERC1155PackedBalanceUpgradeable,
* @param _signer Address to query signature nonce for
*/
function _getNonce(address _signer)
internal view returns (uint256 nonce)
internal view virtual returns (uint256 nonce)
{
return StorageSlot.getUint256Slot(keccak256(abi.encodePacked(_NONCES_SLOT_KEY, _signer))).value;
}
Expand All @@ -334,7 +334,7 @@ contract ERC1155MetaPackedBalanceUpgradeable is ERC1155PackedBalanceUpgradeable,
* @param _signer Address to set signature nonce for
* @param _nonce Nonce value to set
*/
function _setNonce(address _signer, uint256 _nonce) internal {
function _setNonce(address _signer, uint256 _nonce) internal virtual {
StorageSlot.getUint256Slot(keccak256(abi.encodePacked(_NONCES_SLOT_KEY, _signer))).value = _nonce;
}

Expand All @@ -350,7 +350,7 @@ contract ERC1155MetaPackedBalanceUpgradeable is ERC1155PackedBalanceUpgradeable,
* @param _g GasReceipt object that contains gas reimbursement information
*/
function _transferGasFee(address _from, GasReceipt memory _g)
internal
internal virtual
{
// Pop last byte to get token fee type
uint8 feeTokenTypeRaw = uint8(_g.feeTokenData.popLastByte());
Expand Down
8 changes: 4 additions & 4 deletions ...tracts/tokens/ERC1155PackedBalanceUpgradeable/ERC1155MintBurnPackedBalanceUpgradeable.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ contract ERC1155MintBurnPackedBalanceUpgradeable is ERC1155PackedBalanceUpgradea
* @param _data Data to pass if receiver is contract
*/
function _mint(address _to, uint256 _id, uint256 _amount, bytes memory _data)
internal
internal virtual
{
//Add _amount
_updateIDBalance(_to, _id, _amount, Operations.Add); // Add amount to recipient
Expand All @@ -42,7 +42,7 @@ contract ERC1155MintBurnPackedBalanceUpgradeable is ERC1155PackedBalanceUpgradea
* @param _data Data to pass if receiver is contract
*/
function _batchMint(address _to, uint256[] memory _ids, uint256[] memory _amounts, bytes memory _data)
internal
internal virtual
{
require(_ids.length == _amounts.length, "ERC1155MintBurnPackedBalance#_batchMint: INVALID_ARRAYS_LENGTH");

Expand Down Expand Up @@ -99,7 +99,7 @@ contract ERC1155MintBurnPackedBalanceUpgradeable is ERC1155PackedBalanceUpgradea
* @param _amount The amount to be burned
*/
function _burn(address _from, uint256 _id, uint256 _amount)
internal
internal virtual
{
// Substract _amount
_updateIDBalance(_from, _id, _amount, Operations.Sub);
Expand All @@ -119,7 +119,7 @@ contract ERC1155MintBurnPackedBalanceUpgradeable is ERC1155PackedBalanceUpgradea
* @param _amounts Array of the amount to be burned
*/
function _batchBurn(address _from, uint256[] memory _ids, uint256[] memory _amounts)
internal
internal virtual
{
// Number of burning to execute
uint256 nBurn = _ids.length;
Expand Down
38 changes: 19 additions & 19 deletions src/contracts/tokens/ERC1155PackedBalanceUpgradeable/ERC1155PackedBalanceUpgradeable.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ contract ERC1155PackedBalanceUpgradeable is ContextUpgradeable, IERC1155, ERC165
* @param _data Additional data with no specified format, sent in call to `_to`
*/
function safeTransferFrom(address _from, address _to, uint256 _id, uint256 _amount, bytes memory _data)
public override
public virtual override
{
// Requirements
require((_msgSender() == _from) || isApprovedForAll(_from, _msgSender()), "ERC1155PackedBalance#safeTransferFrom: INVALID_OPERATOR");
Expand All @@ -76,7 +76,7 @@ contract ERC1155PackedBalanceUpgradeable is ContextUpgradeable, IERC1155, ERC165
* @param _data Additional data with no specified format, sent in call to `_to`
*/
function safeBatchTransferFrom(address _from, address _to, uint256[] memory _ids, uint256[] memory _amounts, bytes memory _data)
public override
public virtual override
{
// Requirements
require((_msgSender() == _from) || isApprovedForAll(_from, _msgSender()), "ERC1155PackedBalance#safeBatchTransferFrom: INVALID_OPERATOR");
Expand All @@ -99,7 +99,7 @@ contract ERC1155PackedBalanceUpgradeable is ContextUpgradeable, IERC1155, ERC165
* @param _amount Transfered amount
*/
function _safeTransferFrom(address _from, address _to, uint256 _id, uint256 _amount)
internal
internal virtual
{
//Update balances
_updateIDBalance(_from, _id, _amount, Operations.Sub); // Subtract amount from sender
Expand All @@ -113,7 +113,7 @@ contract ERC1155PackedBalanceUpgradeable is ContextUpgradeable, IERC1155, ERC165
* @notice Verifies if receiver is contract and if so, calls (_to).onERC1155Received(...)
*/
function _callonERC1155Received(address _from, address _to, uint256 _id, uint256 _amount, uint256 _gasLimit, bytes memory _data)
internal
internal virtual
{
// Check if recipient is contract
if (_to.isContract()) {
Expand All @@ -131,7 +131,7 @@ contract ERC1155PackedBalanceUpgradeable is ContextUpgradeable, IERC1155, ERC165
* @param _amounts Transfer amounts per token type
*/
function _safeBatchTransferFrom(address _from, address _to, uint256[] memory _ids, uint256[] memory _amounts)
internal
internal virtual
{
uint256 nTransfer = _ids.length; // Number of transfer to execute
require(nTransfer == _amounts.length, "ERC1155PackedBalance#_safeBatchTransferFrom: INVALID_ARRAYS_LENGTH");
Expand Down Expand Up @@ -187,7 +187,7 @@ contract ERC1155PackedBalanceUpgradeable is ContextUpgradeable, IERC1155, ERC165
* @notice Verifies if receiver is contract and if so, calls (_to).onERC1155BatchReceived(...)
*/
function _callonERC1155BatchReceived(address _from, address _to, uint256[] memory _ids, uint256[] memory _amounts, uint256 _gasLimit, bytes memory _data)
internal
internal virtual
{
// Pass data if recipient is contract
if (_to.isContract()) {
Expand All @@ -207,7 +207,7 @@ contract ERC1155PackedBalanceUpgradeable is ContextUpgradeable, IERC1155, ERC165
* @param _approved True if the operator is approved, false to revoke approval
*/
function setApprovalForAll(address _operator, bool _approved)
external override
external virtual override
{
// Update operator status
_setOperator(_msgSender(), _operator, _approved);
Expand All @@ -221,7 +221,7 @@ contract ERC1155PackedBalanceUpgradeable is ContextUpgradeable, IERC1155, ERC165
* @return isOperator True if the operator is approved, false if not
*/
function isApprovedForAll(address _owner, address _operator)
public override view returns (bool isOperator)
public view virtual override returns (bool isOperator)
{
return _getOperator(_owner, _operator);
}
Expand All @@ -238,7 +238,7 @@ contract ERC1155PackedBalanceUpgradeable is ContextUpgradeable, IERC1155, ERC165
* @return The _owner's balance of the Token type requested
*/
function balanceOf(address _owner, uint256 _id)
public override view returns (uint256)
public view virtual override returns (uint256)
{
uint256 bin;
uint256 index;
Expand All @@ -255,7 +255,7 @@ contract ERC1155PackedBalanceUpgradeable is ContextUpgradeable, IERC1155, ERC165
* @return The _owner's balance of the Token types requested (i.e. balance for each (owner, id) pair)
*/
function balanceOfBatch(address[] memory _owners, uint256[] memory _ids)
public override view returns (uint256[] memory)
public view virtual override returns (uint256[] memory)
{
uint256 n_owners = _owners.length;
require(n_owners == _ids.length, "ERC1155PackedBalance#balanceOfBatch: INVALID_ARRAY_LENGTH");
Expand Down Expand Up @@ -300,7 +300,7 @@ contract ERC1155PackedBalanceUpgradeable is ContextUpgradeable, IERC1155, ERC165
* Operations.Sub: Substract _amount from id balance
*/
function _updateIDBalance(address _address, uint256 _id, uint256 _amount, Operations _operation)
internal
internal virtual
{
uint256 bin;
uint256 index;
Expand All @@ -322,7 +322,7 @@ contract ERC1155PackedBalanceUpgradeable is ContextUpgradeable, IERC1155, ERC165
* Operations.Sub: Substract _amount from value in _binValues at _index
*/
function _viewUpdateBinValue(uint256 _binValues, uint256 _index, uint256 _amount, Operations _operation)
internal pure returns (uint256 newBinValues)
internal pure virtual returns (uint256 newBinValues)
{
uint256 shift = IDS_BITS_SIZE * _index;
uint256 mask = (uint256(1) << IDS_BITS_SIZE) - 1;
Expand Down Expand Up @@ -354,7 +354,7 @@ contract ERC1155PackedBalanceUpgradeable is ContextUpgradeable, IERC1155, ERC165
* @return bin index (Bin number, ID"s index within that bin)
*/
function getIDBinIndex(uint256 _id)
public pure returns (uint256 bin, uint256 index)
public pure virtual returns (uint256 bin, uint256 index)
{
bin = _id / IDS_PER_UINT256;
index = _id % IDS_PER_UINT256;
Expand All @@ -368,7 +368,7 @@ contract ERC1155PackedBalanceUpgradeable is ContextUpgradeable, IERC1155, ERC165
* @return amount at given _index in _bin
*/
function getValueInBin(uint256 _binValues, uint256 _index)
public pure returns (uint256)
public pure virtual returns (uint256)
{
// require(_index < IDS_PER_UINT256) is not required since getIDBinIndex ensures `_index < IDS_PER_UINT256`

Expand All @@ -384,19 +384,19 @@ contract ERC1155PackedBalanceUpgradeable is ContextUpgradeable, IERC1155, ERC165
| Storage Functions |
|__________________________________*/

function _getBalance(address _owner, uint256 _id) internal view returns (uint256) {
function _getBalance(address _owner, uint256 _id) internal view virtual returns (uint256) {
return StorageSlot.getUint256Slot(keccak256(abi.encodePacked(_BALANCES_SLOT_KEY, _owner, _id))).value;
}

function _setBalance(address _owner, uint256 _id, uint256 _balance) internal {
function _setBalance(address _owner, uint256 _id, uint256 _balance) internal virtual {
StorageSlot.getUint256Slot(keccak256(abi.encodePacked(_BALANCES_SLOT_KEY, _owner, _id))).value = _balance;
}

function _getOperator(address _owner, address _operator) internal view returns (bool) {
function _getOperator(address _owner, address _operator) internal view virtual returns (bool) {
return StorageSlot.getBooleanSlot(keccak256(abi.encodePacked(_OPERATORS_SLOT_KEY, _owner, _operator))).value;
}

function _setOperator(address _owner, address _operator, bool _approved) internal {
function _setOperator(address _owner, address _operator, bool _approved) internal virtual {
StorageSlot.getBooleanSlot(keccak256(abi.encodePacked(_OPERATORS_SLOT_KEY, _owner, _operator))).value = _approved;
}

Expand All @@ -410,7 +410,7 @@ contract ERC1155PackedBalanceUpgradeable is ContextUpgradeable, IERC1155, ERC165
* @param _interfaceID The interface identifier, as specified in ERC-165
* @return `true` if the contract implements `_interfaceID` and
*/
function supportsInterface(bytes4 _interfaceID) public override(ERC165, IERC165) virtual view returns (bool) {
function supportsInterface(bytes4 _interfaceID) public view virtual override(ERC165, IERC165) returns (bool) {
if (_interfaceID == type(IERC1155).interfaceId) {
return true;
}
Expand Down
10 changes: 5 additions & 5 deletions src/contracts/tokens/ERC1155Upgradeable/ERC1155MetaUpgradeable.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ contract ERC1155MetaUpgradeable is ERC1155Upgradeable, SignatureValidator {
address _signer,
bytes memory _sigData,
bytes memory _encMembers)
internal returns (bytes memory signedData)
internal virtual returns (bytes memory signedData)
{
bytes memory sig;

Expand Down Expand Up @@ -310,7 +310,7 @@ contract ERC1155MetaUpgradeable is ERC1155Upgradeable, SignatureValidator {
* @param _signer Address to query signature nonce for
*/
function getNonce(address _signer)
public view returns (uint256 nonce)
public view virtual returns (uint256 nonce)
{
return _getNonce(_signer);
}
Expand All @@ -320,7 +320,7 @@ contract ERC1155MetaUpgradeable is ERC1155Upgradeable, SignatureValidator {
* @param _signer Address to query signature nonce for
*/
function _getNonce(address _signer)
internal view returns (uint256 nonce)
internal view virtual returns (uint256 nonce)
{
return StorageSlot.getUint256Slot(keccak256(abi.encodePacked(_NONCES_SLOT_KEY, _signer))).value;
}
Expand All @@ -330,7 +330,7 @@ contract ERC1155MetaUpgradeable is ERC1155Upgradeable, SignatureValidator {
* @param _signer Address to set signature nonce for
* @param _nonce Nonce value to set
*/
function _setNonce(address _signer, uint256 _nonce) internal {
function _setNonce(address _signer, uint256 _nonce) internal virtual {
StorageSlot.getUint256Slot(keccak256(abi.encodePacked(_NONCES_SLOT_KEY, _signer))).value = _nonce;
}

Expand All @@ -346,7 +346,7 @@ contract ERC1155MetaUpgradeable is ERC1155Upgradeable, SignatureValidator {
* @param _g GasReceipt object that contains gas reimbursement information
*/
function _transferGasFee(address _from, GasReceipt memory _g)
internal
internal virtual
{
// Pop last byte to get token fee type
uint8 feeTokenTypeRaw = uint8(_g.feeTokenData.popLastByte());
Expand Down
8 changes: 4 additions & 4 deletions src/contracts/tokens/ERC1155Upgradeable/ERC1155MintBurnUpgradeable.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ contract ERC1155MintBurnUpgradeable is ERC1155Upgradeable {
* @param _data Data to pass if receiver is contract
*/
function _mint(address _to, uint256 _id, uint256 _amount, bytes memory _data)
internal
internal virtual
{
// Add _amount
_updateBalance(_to, _id, _amount, Operations.Add);
Expand All @@ -42,7 +42,7 @@ contract ERC1155MintBurnUpgradeable is ERC1155Upgradeable {
* @param _data Data to pass if receiver is contract
*/
function _batchMint(address _to, uint256[] memory _ids, uint256[] memory _amounts, bytes memory _data)
internal
internal virtual
{
require(_ids.length == _amounts.length, "ERC1155MintBurn#batchMint: INVALID_ARRAYS_LENGTH");

Expand Down Expand Up @@ -74,7 +74,7 @@ contract ERC1155MintBurnUpgradeable is ERC1155Upgradeable {
* @param _amount The amount to be burned
*/
function _burn(address _from, uint256 _id, uint256 _amount)
internal
internal virtual
{
//Substract _amount
_updateBalance(_from, _id, _amount, Operations.Sub);
Expand All @@ -90,7 +90,7 @@ contract ERC1155MintBurnUpgradeable is ERC1155Upgradeable {
* @param _amounts Array of the amount to be burned
*/
function _batchBurn(address _from, uint256[] memory _ids, uint256[] memory _amounts)
internal
internal virtual
{
// Number of mints to execute
uint256 nBurn = _ids.length;
Expand Down
Loading

0 comments on commit 9a9757c

Please sign in to comment.