-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
upgraded dependencies openzeppelin to v5
- Loading branch information
1 parent
1fe8e0c
commit 42bad08
Showing
5 changed files
with
27 additions
and
22 deletions.
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,10 @@ | ||
// SPDX-License-Identifier: MIT | ||
pragma solidity ^0.8.19; | ||
pragma solidity ^0.8.24; | ||
|
||
import "./XRC20.sol"; | ||
import "./interfaces/ISolaxy.sol"; | ||
import {UD60x18, ud60x18} from "@prb/[email protected].1/src/UD60x18.sol"; | ||
import {IERC721} from "@openzeppelin/contracts@4.9.3/interfaces/IERC721.sol"; | ||
import {UD60x18, ud60x18} from "@prb/[email protected].2/src/UD60x18.sol"; | ||
import {IERC721} from "@openzeppelin/contracts@5.0.2/interfaces/IERC721.sol"; | ||
|
||
/** | ||
* @title Solaxy | ||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,28 @@ | ||
// SPDX-License-Identifier: MIT | ||
pragma solidity ^0.8.19; | ||
pragma solidity ^0.8.24; | ||
|
||
import "@openzeppelin/contracts@4.9.3/token/ERC20/ERC20.sol"; | ||
import "@openzeppelin/contracts@4.9.3/token/ERC20/extensions/ERC20Permit.sol"; | ||
import "@openzeppelin/contracts@4.9.3/token/ERC20/extensions/ERC20Votes.sol"; | ||
import "@openzeppelin/contracts@4.9.3/token/ERC20/extensions/ERC20FlashMint.sol"; | ||
import "@openzeppelin/contracts@5.0.2/token/ERC20/ERC20.sol"; | ||
import "@openzeppelin/contracts@5.0.2/token/ERC20/extensions/ERC20Permit.sol"; | ||
import "@openzeppelin/contracts@5.0.2/token/ERC20/extensions/ERC20Votes.sol"; | ||
import "@openzeppelin/contracts@5.0.2/token/ERC20/extensions/ERC20FlashMint.sol"; | ||
|
||
abstract contract XRC20 is ERC20, ERC20Permit, ERC20Votes, ERC20FlashMint { | ||
// The following functions are overrides required by Solidity. | ||
|
||
function _afterTokenTransfer(address from, address to, uint256 amount) internal override(ERC20, ERC20Votes) { | ||
super._afterTokenTransfer(from, to, amount); | ||
function _update(address from, address to, uint256 value) | ||
internal | ||
override(ERC20, ERC20Votes) | ||
{ | ||
super._update(from, to, value); | ||
} | ||
|
||
function _mint(address to, uint256 amount) internal override(ERC20, ERC20Votes) { | ||
super._mint(to, amount); | ||
} | ||
|
||
function _burn(address account, uint256 amount) internal override(ERC20, ERC20Votes) { | ||
super._burn(account, amount); | ||
function nonces(address owner) | ||
public | ||
view | ||
override(ERC20Permit, Nonces) | ||
returns (uint256) | ||
{ | ||
return super.nonces(owner); | ||
} | ||
} | ||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
// SPDX-License-Identifier: MIT | ||
pragma solidity ^0.8.19; | ||
pragma solidity ^0.8.24; | ||
|
||
import {IERC4626} from "@openzeppelin/contracts@4.9.3/interfaces/IERC4626.sol"; | ||
import {UD60x18} from "@prb/[email protected].1/src/UD60x18.sol"; | ||
import {IERC4626} from "@openzeppelin/contracts@5.0.2/interfaces/IERC4626.sol"; | ||
import {UD60x18} from "@prb/[email protected].2/src/UD60x18.sol"; | ||
|
||
error PayableErr(); | ||
error Undersupply(); | ||
|
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
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