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

using v5 of oz contracts #8

Closed
wants to merge 1 commit into from
Closed

using v5 of oz contracts #8

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
11 changes: 9 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,18 @@
url = https://github.com/foundry-rs/forge-std
[submodule "lib/LayerZero-v2"]
path = lib/LayerZero-v2
url = https://github.com/JorgeAtPaladin/LayerZero-v2
branch = lz-upgrade
url = https://github.com/dan13ram/layerzero-v2-upgradeable
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uses my fork of this repo

https://github.com/dan13ram/layerzero-v2-upgradeable

Which is one commit ahead, diff below:
JorgeAtPaladin/LayerZero-v2@lz-upgrade...dan13ram:layerzero-v2-upgradeable:main

[submodule "lib/solmate"]
path = lib/solmate
url = https://github.com/transmissions11/solmate
[submodule "lib/surl"]
path = lib/surl
url = https://github.com/memester-xyz/surl
[submodule "lib/openzeppelin-contracts-upgradeable"]
path = lib/openzeppelin-contracts-upgradeable
url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
branch = release-v5.0
[submodule "lib/openzeppelin-contracts"]
path = lib/openzeppelin-contracts
url = https://github.com/OpenZeppelin/openzeppelin-contracts
branch = release-v5.0
2 changes: 1 addition & 1 deletion lib/LayerZero-v2
Open in desktop
Submodule LayerZero-v2 updated 41 files
+1 −1 messagelib/contracts/Executor.sol
+1 −1 messagelib/contracts/ExecutorFeeLib.sol
+1 −1 messagelib/contracts/PriceFeed.sol
+2 −0 messagelib/contracts/Treasury.sol
+5 −5 messagelib/contracts/Worker.sol
+1 −1 messagelib/contracts/uln/LzExecutor.sol
+1 −1 messagelib/contracts/uln/dvn/DVNFeeLib.sol
+1 −1 messagelib/contracts/uln/dvn/MultiSig.sol
+1 −1 messagelib/contracts/uln/dvn/adapters/CCIP/CCIPDVNAdapterFeeLib.sol
+1 −1 messagelib/contracts/uln/dvn/adapters/axelar/AxelarDVNAdapterFeeLib.sol
+3 −1 messagelib/contracts/uln/uln301/ReceiveLibBaseE1.sol
+3 −0 messagelib/contracts/uln/uln301/SendUln301.sol
+3 −1 messagelib/contracts/uln/uln302/ReceiveUln302.sol
+3 −1 messagelib/contracts/uln/uln302/SendUln302.sol
+5 −5 messagelib/contracts/upgradeable/WorkerUpgradeable.sol
+0 −96 messagelib/contracts/upgradeable/proxy/ProxyAdmin.sol
+0 −131 messagelib/contracts/upgradeable/proxy/TransparentUpgradeableProxy.sol
+2 −2 messagelib/package.json
+3 −0 messagelib/test/AddressSizeConfig.t.sol
+8 −46 messagelib/test/DVN.t.sol
+4 −1 messagelib/test/LzExecutor.t.sol
+4 −0 messagelib/test/ReceiveUlnBase.t.sol
+3 −1 messagelib/test/SendLibBase.t.sol
+3 −1 messagelib/test/SendLibBaseE1.t.sol
+3 −1 messagelib/test/SendLibBaseE2.t.sol
+3 −1 messagelib/test/SendUlnBase.t.sol
+3 −1 messagelib/test/UlnBase.t.sol
+1 −1 messagelib/test/mocks/EndpointV1.sol
+1 −2 oapp/contracts/oapp/examples/OmniCounterPreCrimeUpgradeable.sol
+1 −2 oapp/contracts/oapp/examples/OmniCounterUpgradeable.sol
+2 −2 oapp/package.json
+1 −2 oapp/test/mocks/OFTAdapterUpgradeableMock.sol
+1 −2 oapp/test/mocks/OFTUpgradeableMock.sol
+1 −2 oapp/test/mocks/PreCrimeV2SimulatorUpgradeableMock.sol
+1 −2 oapp/test/mocks/PreCrimeV2UpgradeableMock.sol
+2 −2 protocol/contracts/EndpointV2.sol
+1 −1 protocol/contracts/messagelib/SimpleMessageLib.sol
+2 −2 protocol/package.json
+10 −4 protocol/test/MessageLibManager.t.sol
+2 −0 protocol/test/mocks/TreasuryMock.sol
+16 −14 yarn.lock
1 change: 1 addition & 0 deletions lib/openzeppelin-contracts
Open in desktop
Submodule openzeppelin-contracts added at dbb610
1 change: 1 addition & 0 deletions lib/openzeppelin-contracts-upgradeable
Open in desktop
Submodule openzeppelin-contracts-upgradeable added at 723f8c
4 changes: 0 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
"@layerzerolabs/lz-evm-oapp-v2": "^2.1.18",
"@layerzerolabs/lz-evm-protocol-v2": "^2.1.27",
"@layerzerolabs/lz-evm-v1-0.7": "^2.3.40",
"@openzeppelin/contracts": "5.0.2",
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moves all openzeppelin deps to submodule

"@openzeppelin/contracts-upgradeable": "5.0.2",
"@openzeppelin/contracts-4.9.2": "npm:@openzeppelin/[email protected]",
"@openzeppelin/contracts-upgradeable-4.9.2": "npm:@openzeppelin/[email protected]",
"hardhat-deploy": "^0.12.4",
"husky": "^9.1.5",
"lint-staged": "^15.2.10",
Expand Down
7 changes: 3 additions & 4 deletions remappings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
@layerzerolabs/lz-evm-oapp-v2/contracts/=node_modules/@layerzerolabs/lz-evm-oapp-v2/contracts/
@layerzerolabs/lz-evm-v1-0.7/=node_modules/@layerzerolabs/lz-evm-v1-0.7/
@openzeppelin/contracts/=node_modules/@openzeppelin/contracts-4.9.2/
@openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable-4.9.2/

@openzeppelin/contracts-5/=node_modules/@openzeppelin/contracts/
@openzeppelin/contracts-upgradeable-5/=node_modules/@openzeppelin/contracts-upgradeable/
@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/
@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/

solidity-bytes-utils/=node_modules/solidity-bytes-utils/
hardhat-deploy/=node_modules/hardhat-deploy/
Expand All @@ -20,3 +18,4 @@ forge-std/=lib/forge-std/src/
solmate/=lib/solmate/src/
surl/=lib/surl/src/
solidity-stringutils/=lib/surl/lib/solidity-stringutils/src/

3 changes: 1 addition & 2 deletions script/BaseScript.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ import {BaseData} from "./BaseData.s.sol";
import {L1YnOFTAdapterUpgradeable} from "@/L1YnOFTAdapterUpgradeable.sol";
import {ImmutableMultiChainDeployer} from "@/factory/ImmutableMultiChainDeployer.sol";
import {RateLimiter} from "@layerzerolabs/lz-evm-oapp-v2/contracts/oapp/utils/RateLimiter.sol";
import {EndpointV2} from "@layerzerolabs/lz-evm-protocol-v2/contracts/EndpointV2.sol";
import {TransparentUpgradeableProxy} from
"@openzeppelin/contracts-5/proxy/transparent/TransparentUpgradeableProxy.sol";
"@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
import {Utils} from "script/Utils.sol";

import {console} from "forge-std/console.sol";
Expand Down
5 changes: 3 additions & 2 deletions script/DeployL1OFTAdapter.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ import {BaseScript} from "./BaseScript.s.sol";
import {L1YnOFTAdapterUpgradeable} from "@/L1YnOFTAdapterUpgradeable.sol";
import {RateLimiter} from "@layerzerolabs/lz-evm-oapp-v2/contracts/oapp/utils/RateLimiter.sol";

import {Ownable} from "@openzeppelin/contracts-5/access/Ownable.sol";
import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
import {
ITransparentUpgradeableProxy,
ProxyAdmin,
TransparentUpgradeableProxy
} from "@openzeppelin/contracts-5/proxy/transparent/TransparentUpgradeableProxy.sol";
} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";

import {console} from "forge-std/console.sol";

Expand Down
6 changes: 3 additions & 3 deletions script/DeployL2OFTAdapter.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@ import {L2YnOFTAdapterUpgradeable} from "@/L2YnOFTAdapterUpgradeable.sol";
import {ImmutableMultiChainDeployer} from "@/factory/ImmutableMultiChainDeployer.sol";
import {RateLimiter} from "@layerzerolabs/lz-evm-oapp-v2/contracts/oapp/utils/RateLimiter.sol";

import {Ownable} from "@openzeppelin/contracts-5/access/Ownable.sol";
import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
import {
ITransparentUpgradeableProxy,
ProxyAdmin,
TransparentUpgradeableProxy
} from "@openzeppelin/contracts-5/proxy/transparent/TransparentUpgradeableProxy.sol";
} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";

import {console} from "forge-std/console.sol";

Expand Down Expand Up @@ -105,7 +106,6 @@ contract DeployL2OFTAdapter is BaseScript {
);

vm.broadcast();

address newOwner = getData(block.chainid).PROXY_ADMIN;
console.log("Changing owner for L2OFTAdapter to: %s", newOwner);
Ownable(getTransparentUpgradeableProxyAdminAddress(address(l2OFTAdapter))).transferOwnership(newOwner);
Expand Down
3 changes: 1 addition & 2 deletions script/Utils.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
pragma solidity ^0.8.24;

import {Vm} from "lib/forge-std/src/Vm.sol";
// import {ERC1967Utils} from "lib/openzeppelin-contracts/contracts/proxy/ERC1967/ERC1967Utils.sol";

import {ERC1967Utils} from "@openzeppelin/contracts-5/proxy/ERC1967/ERC1967Utils.sol";
import {ERC1967Utils} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Utils.sol";

contract Utils {
/**
Expand Down
2 changes: 1 addition & 1 deletion script/VerifyL1OFTAdapter.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {RateLimiter} from "@layerzerolabs/lz-evm-oapp-v2/contracts/oapp/utils/Ra
import {
ITransparentUpgradeableProxy,
TransparentUpgradeableProxy
} from "@openzeppelin/contracts-5/proxy/transparent/TransparentUpgradeableProxy.sol";
} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
import {console} from "forge-std/console.sol";

// forge script script/VerifyL1OFTAdapter.s.sol:DeployL1OFTAdapter \
Expand Down
2 changes: 1 addition & 1 deletion script/VerifyL2OFTAdapter.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {RateLimiter} from "@layerzerolabs/lz-evm-oapp-v2/contracts/oapp/utils/Ra
import {
ITransparentUpgradeableProxy,
TransparentUpgradeableProxy
} from "@openzeppelin/contracts-5/proxy/transparent/TransparentUpgradeableProxy.sol";
} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
import {console} from "forge-std/console.sol";

// forge script script/VerifyL2OFTAdapter.s.sol:DeployL2Adapter \
Expand Down
3 changes: 1 addition & 2 deletions src/L1YnOFTAdapterUpgradeable.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ contract L1YnOFTAdapterUpgradeable is OFTAdapterUpgradeable, RateLimiter {
*/
function initialize(address _owner) external virtual initializer {
__OFTAdapter_init(_owner);
__Ownable_init();
_transferOwnership(_owner);
__Ownable_init(_owner);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/L2YnERC20Upgradeable.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.24;

import "src/external/AccessControlUpgradeable.sol";
import "src/external/ERC20Upgradeable.sol";
import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removes the need for oz contracts inside our repo

import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";

import {IMintableBurnableERC20} from "@/interfaces/IMintableBurnableERC20.sol";

Expand Down
3 changes: 1 addition & 2 deletions src/L2YnOFTAdapterUpgradeable.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ contract L2YnOFTAdapterUpgradeable is OFTAdapterUpgradeable, RateLimiter {
*/
function initialize(address _owner) external virtual initializer {
__OFTAdapter_init(_owner);
__Ownable_init();
_transferOwnership(_owner);
__Ownable_init(_owner);
}

/**
Expand Down
Loading