Skip to content

feat: updated OZ to 5.5 #15

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.

Sign up for GitHub

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

Open
grshv-cw wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: updated OZ to 5.5 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions .cursor/rules/solidity-example-project.mdc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ alwaysApply: false
```solidity
// SPDX-License-Identifier: MIT

pragma solidity 0.8.24;
pragma solidity 0.8.28;

import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
Expand Down Expand Up @@ -613,14 +613,16 @@ abstract contract RescuableUpgradeable is AccessControlExtUpgradeable {

pragma solidity ^0.8.20;

import { UUPSUpgradeable } from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
import { UUPSUpgradeable } from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";

import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable.sol";

/**
* @title UUPSExtUpgradeable base contract
* @author CloudWalk Inc. (See https://www.cloudwalk.io)
* @dev Extends OpenZeppelin's {UUPSUpgradeable} contract with additional checks for the new implementation address.
*/
abstract contract UUPSExtUpgradeable is UUPSUpgradeable {
abstract contract UUPSExtUpgradeable is UUPSUpgradeable, Initializable {
// ------------------ Errors ---------------------------------- //

/// @dev Thrown if the provided new implementation address is not a contract.
Expand Down Expand Up @@ -686,7 +688,7 @@ import "../interfaces/IVersionable.sol";
abstract contract Versionable is IVersionable {
/// @inheritdoc IVersionable
function $__VERSION() external pure returns (Version memory) {
return Version(1, 1, 0);
return Version(1, 1, 1);
}
}
```
Expand Down
6 changes: 4 additions & 2 deletions contracts/base/UUPSExtUpgradeable.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@

pragma solidity ^0.8.20;

import { UUPSUpgradeable } from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
import { UUPSUpgradeable } from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";

import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable.sol";

/**
* @title UUPSExtUpgradeable base contract
* @author CloudWalk Inc. (See https://www.cloudwalk.io)
* @dev Extends OpenZeppelin's {UUPSUpgradeable} contract with additional checks for the new implementation address.
*/
abstract contract UUPSExtUpgradeable is UUPSUpgradeable {
abstract contract UUPSExtUpgradeable is UUPSUpgradeable, Initializable {
// ------------------ Errors ---------------------------------- //

/// @dev Thrown if the provided new implementation address is not a contract.
Expand Down
Loading