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.

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

Fixes all contracts to be compatible with the OpenZeppelin V5 update #138

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fixes all contracts to be compatible with the OpenZeppelin V5 update #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
610dc95
This is a fix that updates the LayerZero/solidity-examples code to be…
Jan 7, 2024
20311f2
This fixes all remaining contracts to be compactible with the OpenZep…
Jan 7, 2024
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
2 changes: 1 addition & 1 deletion contracts/lzApp/LzApp.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ abstract contract LzApp is Ownable, ILayerZeroReceiver, ILayerZeroUserApplicatio
event SetTrustedRemoteAddress(uint16 _remoteChainId, bytes _remoteAddress);
event SetMinDstGas(uint16 _dstChainId, uint16 _type, uint _minDstGas);

constructor(address _endpoint) {
constructor(address _endpoint) Ownable(_msgSender()){
lzEndpoint = ILayerZeroEndpoint(_endpoint);
}

Expand Down
2 changes: 1 addition & 1 deletion contracts/token/oft/v1/NativeOFT.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pragma solidity ^0.8.0;

import "@openzeppelin/contracts/security/ReentrancyGuard.sol";
import "@openzeppelin/contracts/utils/ReentrancyGuard.sol";
import "./OFT.sol";

contract NativeOFT is OFT, ReentrancyGuard {
Expand Down
2 changes: 1 addition & 1 deletion contracts/token/oft/v2/NativeOFTV2.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pragma solidity ^0.8.0;

import "@openzeppelin/contracts/security/ReentrancyGuard.sol";
import "@openzeppelin/contracts/utils/ReentrancyGuard.sol";
import "./OFTV2.sol";

contract NativeOFTV2 is OFTV2, ReentrancyGuard {
Expand Down
2 changes: 1 addition & 1 deletion contracts/token/oft/v2/fee/Fee.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ abstract contract Fee is Ownable {
event SetDefaultFeeBp(uint16 feeBp);
event SetFeeOwner(address feeOwner);

constructor(){
constructor() Ownable(_msgSender()){
feeOwner = owner();
}

Expand Down
2 changes: 1 addition & 1 deletion contracts/token/oft/v2/fee/NativeOFTWithFee.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pragma solidity ^0.8.0;

import "@openzeppelin/contracts/security/ReentrancyGuard.sol";
import "@openzeppelin/contracts/utils/ReentrancyGuard.sol";
import "./OFTWithFee.sol";

contract NativeOFTWithFee is OFTWithFee, ReentrancyGuard {
Expand Down
2 changes: 1 addition & 1 deletion contracts/token/onft721/ONFT721Core.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pragma solidity ^0.8.0;
import "./interfaces/IONFT721Core.sol";
import "../../lzApp/NonblockingLzApp.sol";
import "@openzeppelin/contracts/utils/introspection/ERC165.sol";
import "@openzeppelin/contracts/security/ReentrancyGuard.sol";
import "@openzeppelin/contracts/utils/ReentrancyGuard.sol";

abstract contract ONFT721Core is NonblockingLzApp, ERC165, ReentrancyGuard, IONFT721Core {
uint16 public constant FUNCTION_TYPE_SEND = 1;
Expand Down