Skip to content

improve: move LayerZero libs to external/ folder #1151

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

Merged
merged 1 commit into from
Oct 22, 2025
Merged

improve: move LayerZero libs to external/ folder #1151

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
6 changes: 4 additions & 2 deletions contracts/libraries/MinimalLZOptions.sol → ...s/external/libraries/MinimalLZOptions.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.23;

import { BytesLib } from "./BytesLib.sol";
import "@openzeppelin/contracts/utils/math/SafeCast.sol";
import { BytesLib } from "../../libraries/BytesLib.sol";
import { SafeCast } from "@openzeppelin/contracts/utils/math/SafeCast.sol";

/**
* @title MinimalExecutorOptions
* @notice This library is used to provide minimal required functionality of
* https://github.com/LayerZero-Labs/LayerZero-v2/blob/2ff4988f85b5c94032eb71bbc4073e69c078179d/packages/layerzero-v2/evm/messagelib/contracts/libs/ExecutorOptions.sol#L7
* Code was copied, was not modified
*/
library MinimalExecutorOptions {
uint8 internal constant WORKER_ID = 1;
Expand All @@ -28,6 +29,7 @@ library MinimalExecutorOptions {
* @title MinimalLZOptions
* @notice This library is used to provide minimal functionality of
* https://github.com/LayerZero-Labs/devtools/blob/52ad590ab249f660f803ae3aafcbf7115733359c/packages/oapp-evm/contracts/oapp/libs/OptionsBuilder.sol
* Code was copied, was not modified
*/
library MinimalLZOptions {
// @dev Only used in `onlyType3` modifier
Expand Down
2 changes: 1 addition & 1 deletion contracts/libraries/OFTComposeMsgCodec.sol → ...external/libraries/OFTComposeMsgCodec.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pragma solidity ^0.8.20;
* @title OFTComposeMsgCodec
* @notice Copied from LZ implementation here:
* https://github.com/LayerZero-Labs/devtools/blob/608915a7e260d995ce28e41c4e4877db9b18613b/packages/oft-evm/contracts/libs/OFTComposeMsgCodec.sol#L5
*
* Code was copied, was not modified
*/
library OFTComposeMsgCodec {
// Offset constants for decoding composed messages
Expand Down
4 changes: 1 addition & 3 deletions contracts/periphery/mintburn/sponsored-oft/DstOFTHandler.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,15 @@
pragma solidity ^0.8.23;

import { ILayerZeroComposer } from "../../../external/interfaces/ILayerZeroComposer.sol";
import { OFTComposeMsgCodec } from "../../../libraries/OFTComposeMsgCodec.sol";
import { OFTComposeMsgCodec } from "../../../external/libraries/OFTComposeMsgCodec.sol";
import { DonationBox } from "../../../chain-adapters/DonationBox.sol";
import { HyperCoreLib } from "../../../libraries/HyperCoreLib.sol";
import { ComposeMsgCodec } from "./ComposeMsgCodec.sol";
import { ExecutionMode } from "./Structs.sol";
import { AddressToBytes32, Bytes32ToAddress } from "../../../libraries/AddressConverters.sol";
import { IOFT, IOAppCore } from "../../../interfaces/IOFT.sol";
import { HyperCoreFlowExecutor } from "../HyperCoreFlowExecutor.sol";
import { ArbitraryActionFlowExecutor } from "../ArbitraryActionFlowExecutor.sol";

import { AccessControl } from "@openzeppelin/contracts/access/AccessControl.sol";
import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";

Expand Down
4 changes: 2 additions & 2 deletions contracts/periphery/mintburn/sponsored-oft/SponsoredOFTSrcPeriphery.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import { Quote } from "./Structs.sol";
import { QuoteSignLib } from "./QuoteSignLib.sol";
import { ComposeMsgCodec } from "./ComposeMsgCodec.sol";

import { IOFT, IOAppCore, IEndpoint, SendParam, MessagingFee } from "../../../interfaces/IOFT.sol";
import { IOFT, IOAppCore, SendParam, MessagingFee } from "../../../interfaces/IOFT.sol";
import { AddressToBytes32 } from "../../../libraries/AddressConverters.sol";
import { MinimalLZOptions } from "../../../libraries/MinimalLZOptions.sol";
import { MinimalLZOptions } from "../../../external/libraries/MinimalLZOptions.sol";

import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
Expand Down
2 changes: 1 addition & 1 deletion script/mintburn/CreateSponsoredDeposit.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { SponsoredOFTSrcPeriphery } from "../../contracts/periphery/mintburn/spo
import { Quote, SignedQuoteParams, UnsignedQuoteParams } from "../../contracts/periphery/mintburn/sponsored-oft/Structs.sol";
import { AddressToBytes32 } from "../../contracts/libraries/AddressConverters.sol";
import { ComposeMsgCodec } from "../../contracts/periphery/mintburn/sponsored-oft/ComposeMsgCodec.sol";
import { MinimalLZOptions } from "../../contracts/libraries/MinimalLZOptions.sol";
import { MinimalLZOptions } from "../../contracts/external/libraries/MinimalLZOptions.sol";
import { IOFT, SendParam, MessagingFee } from "../../contracts/interfaces/IOFT.sol";
import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
Expand Down
Loading