Skip to content

Commit 7b05bb1

Browse files
authored
move LayerZero libs to external/ (#1151)
Signed-off-by: Ihor Farion <ihor@umaproject.org>
1 parent c402e1f commit 7b05bb1

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

contracts/libraries/MinimalLZOptions.sol renamed to contracts/external/libraries/MinimalLZOptions.sol

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.23;
33

4-
import { BytesLib } from "./BytesLib.sol";
5-
import "@openzeppelin/contracts/utils/math/SafeCast.sol";
4+
import { BytesLib } from "../../libraries/BytesLib.sol";
5+
import { SafeCast } from "@openzeppelin/contracts/utils/math/SafeCast.sol";
66

77
/**
88
* @title MinimalExecutorOptions
99
* @notice This library is used to provide minimal required functionality of
1010
* https://github.com/LayerZero-Labs/LayerZero-v2/blob/2ff4988f85b5c94032eb71bbc4073e69c078179d/packages/layerzero-v2/evm/messagelib/contracts/libs/ExecutorOptions.sol#L7
11+
* Code was copied, was not modified
1112
*/
1213
library MinimalExecutorOptions {
1314
uint8 internal constant WORKER_ID = 1;
@@ -28,6 +29,7 @@ library MinimalExecutorOptions {
2829
* @title MinimalLZOptions
2930
* @notice This library is used to provide minimal functionality of
3031
* https://github.com/LayerZero-Labs/devtools/blob/52ad590ab249f660f803ae3aafcbf7115733359c/packages/oapp-evm/contracts/oapp/libs/OptionsBuilder.sol
32+
* Code was copied, was not modified
3133
*/
3234
library MinimalLZOptions {
3335
// @dev Only used in `onlyType3` modifier

contracts/libraries/OFTComposeMsgCodec.sol renamed to contracts/external/libraries/OFTComposeMsgCodec.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ pragma solidity ^0.8.20;
66
* @title OFTComposeMsgCodec
77
* @notice Copied from LZ implementation here:
88
* https://github.com/LayerZero-Labs/devtools/blob/608915a7e260d995ce28e41c4e4877db9b18613b/packages/oft-evm/contracts/libs/OFTComposeMsgCodec.sol#L5
9-
*
9+
* Code was copied, was not modified
1010
*/
1111
library OFTComposeMsgCodec {
1212
// Offset constants for decoding composed messages

contracts/periphery/mintburn/sponsored-oft/DstOFTHandler.sol

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,15 @@
22
pragma solidity ^0.8.23;
33

44
import { ILayerZeroComposer } from "../../../external/interfaces/ILayerZeroComposer.sol";
5-
import { OFTComposeMsgCodec } from "../../../libraries/OFTComposeMsgCodec.sol";
5+
import { OFTComposeMsgCodec } from "../../../external/libraries/OFTComposeMsgCodec.sol";
66
import { DonationBox } from "../../../chain-adapters/DonationBox.sol";
7-
import { HyperCoreLib } from "../../../libraries/HyperCoreLib.sol";
87
import { ComposeMsgCodec } from "./ComposeMsgCodec.sol";
98
import { ExecutionMode } from "./Structs.sol";
109
import { AddressToBytes32, Bytes32ToAddress } from "../../../libraries/AddressConverters.sol";
1110
import { IOFT, IOAppCore } from "../../../interfaces/IOFT.sol";
1211
import { HyperCoreFlowExecutor } from "../HyperCoreFlowExecutor.sol";
1312
import { ArbitraryActionFlowExecutor } from "../ArbitraryActionFlowExecutor.sol";
1413

15-
import { AccessControl } from "@openzeppelin/contracts/access/AccessControl.sol";
1614
import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
1715
import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
1816

contracts/periphery/mintburn/sponsored-oft/SponsoredOFTSrcPeriphery.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import { Quote } from "./Structs.sol";
55
import { QuoteSignLib } from "./QuoteSignLib.sol";
66
import { ComposeMsgCodec } from "./ComposeMsgCodec.sol";
77

8-
import { IOFT, IOAppCore, IEndpoint, SendParam, MessagingFee } from "../../../interfaces/IOFT.sol";
8+
import { IOFT, IOAppCore, SendParam, MessagingFee } from "../../../interfaces/IOFT.sol";
99
import { AddressToBytes32 } from "../../../libraries/AddressConverters.sol";
10-
import { MinimalLZOptions } from "../../../libraries/MinimalLZOptions.sol";
10+
import { MinimalLZOptions } from "../../../external/libraries/MinimalLZOptions.sol";
1111

1212
import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
1313
import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";

script/mintburn/CreateSponsoredDeposit.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { SponsoredOFTSrcPeriphery } from "../../contracts/periphery/mintburn/spo
66
import { Quote, SignedQuoteParams, UnsignedQuoteParams } from "../../contracts/periphery/mintburn/sponsored-oft/Structs.sol";
77
import { AddressToBytes32 } from "../../contracts/libraries/AddressConverters.sol";
88
import { ComposeMsgCodec } from "../../contracts/periphery/mintburn/sponsored-oft/ComposeMsgCodec.sol";
9-
import { MinimalLZOptions } from "../../contracts/libraries/MinimalLZOptions.sol";
9+
import { MinimalLZOptions } from "../../contracts/external/libraries/MinimalLZOptions.sol";
1010
import { IOFT, SendParam, MessagingFee } from "../../contracts/interfaces/IOFT.sol";
1111
import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
1212
import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";

0 commit comments

Comments
 (0)