@layerzerolabs/oapp-evm-contracts 1.2.19 → 1.2.21

package/.turbo/turbo-lint.log

@@ -19,7 +19,7 @@ contracts/interfaces/IOAppCore.sol
   17:5  warning  GC: [eid] on Event [PeerSet] could be Indexed                                   gas-indexed-events
 
 contracts/interfaces/IOAppExtended.sol
-  17:1  warning  Code contains empty blocks  no-empty-blocks
+  21:1  warning  Code contains empty blocks  no-empty-blocks
 
 contracts/interfaces/IOAppMsgInspection.sol
   15:5  warning  GC: [msgInspector] on Event [MsgInspectorSet] could be Indexed  gas-indexed-events

package/contracts/interfaces/IOAppExtended.sol

@@ -1,7 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.22;
 
+import { ILayerZeroReceiver } from "@layerzerolabs/lz-evm-protocol-v2/contracts/interfaces/ILayerZeroReceiver.sol";
 import { IOAppCore } from "./IOAppCore.sol";
+import { IOAppMessagingChannel } from "./IOAppMessagingChannel.sol";
 import { IOAppMsgInspection } from "./IOAppMsgInspection.sol";
 import { IOAppOptionsType3 } from "./IOAppOptionsType3.sol";
 import { IOAppReceiver } from "./IOAppReceiver.sol";
@@ -9,9 +11,19 @@ import { IOAppReceiver } from "./IOAppReceiver.sol";
 /**
  * @title IOAppExtended
  * @author LayerZero Labs (@TRileySchwarz, tinom.eth)
- * @custom:version 1.0.0
+ * @custom:version 1.1.0
  * @notice Aggregate interface for extended OApp contracts.
- * @dev `IOAppReceiver` must precede `IOAppCore` for C3 linearization compatibility with `OApp`,
- *      where `OAppReceiver`'s linearization places `IOAppReceiver` before `IOAppCore`.
+ * @dev `IOAppReceiver` must precede `IOAppCore` for C3 linearization compatibility with `OApp`, where `OAppReceiver`'s
+ *      linearization places `IOAppReceiver` before `IOAppCore`.
+ * @dev `IOAppMessagingChannel` must precede `IOAppCore` for C3 linearization compatibility with messaging-channel OApp
+ *      extensions that declare `IOAppMessagingChannel` before `OAppCoreBaseUpgradeable`.
  */
-interface IOAppExtended is IOAppReceiver, IOAppCore, IOAppOptionsType3, IOAppMsgInspection {}
+interface IOAppExtended is IOAppReceiver, IOAppMessagingChannel, IOAppCore, IOAppOptionsType3, IOAppMsgInspection {}
+
+/// @dev Flatten all leaf interface IDs.
+bytes4 constant OAPP_EXTENDED_INTERFACE_ID = type(ILayerZeroReceiver).interfaceId ^
+    type(IOAppReceiver).interfaceId ^
+    type(IOAppMessagingChannel).interfaceId ^
+    type(IOAppCore).interfaceId ^
+    type(IOAppOptionsType3).interfaceId ^
+    type(IOAppMsgInspection).interfaceId;

package/contracts/interfaces/IOAppMessagingChannel.sol

@@ -0,0 +1,48 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.22;
+
+import { Origin } from "@layerzerolabs/lz-evm-protocol-v2/contracts/interfaces/ILayerZeroEndpointV2.sol";
+
+/**
+ * @title IOAppMessagingChannel
+ * @author LayerZero Labs (tinom.eth)
+ * @custom:version 1.0.0
+ * @notice Interface for OApp wrappers around endpoint messaging channel operations.
+ * @dev Exposes `clear`, `skip`, `burn`, and `nilify` so that access is not limited to the endpoint delegate.
+ */
+interface IOAppMessagingChannel {
+    /**
+     * @notice Permanently consumes a verified inbound message without the `lzReceive` callback.
+     * @param _origin Origin of the message
+     * @param _guid GUID of the message
+     * @param _message Message payload
+     */
+    function clear(Origin calldata _origin, bytes32 _guid, bytes calldata _message) external;
+
+    /**
+     * @notice Permanently skips the next inbound nonce for a path.
+     * @param _srcEid Source endpoint ID
+     * @param _sender Sender address on the source chain
+     * @param _nonce Nonce to skip, must equal `inboundNonce + 1`
+     */
+    function skip(uint32 _srcEid, bytes32 _sender, uint64 _nonce) external;
+
+    /**
+     * @notice Permanently burns a verified or nilified inbound nonce so it can never be executed or re-verified.
+     * @param _srcEid Source endpoint ID
+     * @param _sender Sender address on the source chain
+     * @param _nonce Nonce to burn, must be `<= lazyInboundNonce`
+     * @param _payloadHash Expected payload hash for the nonce
+     */
+    function burn(uint32 _srcEid, bytes32 _sender, uint64 _nonce, bytes32 _payloadHash) external;
+
+    /**
+     * @notice Nilifies an inbound nonce, preventing execution until it is re-verified.
+     * @dev An unverified nonce can be nilified by passing `bytes32(0)` for `_payloadHash`.
+     * @param _srcEid Source endpoint ID
+     * @param _sender Sender address on the source chain
+     * @param _nonce Nonce to nilify
+     * @param _payloadHash Expected payload hash for the nonce
+     */
+    function nilify(uint32 _srcEid, bytes32 _sender, uint64 _nonce, bytes32 _payloadHash) external;
+}

package/foundry.toml

@@ -1,5 +1,5 @@
 [profile.default]
-solc = '0.8.22'
+solc = '0.8.26'
 verbosity = 3
 src = "contracts"
 test = "test"
@@ -7,7 +7,7 @@ out = "out"
 cache_path = "cache"
 libs = ['node_modules', 'node_modules/@layerzerolabs/toolbox-foundry/lib']
 optimizer = true
-optimizer_runs = 200
+optimizer_runs = 20_000
 
 remappings = [
     'ds-test/=node_modules/@layerzerolabs/toolbox-foundry/lib/ds-test/',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@layerzerolabs/oapp-evm-contracts",
-  "version": "1.2.19",
+  "version": "1.2.21",
   "private": false,
   "description": "LayerZero Labs reference EVM OApp implementation",
   "license": "MIT",
@@ -10,13 +10,13 @@
     "@layerzerolabs/lz-evm-v1-0.7": "3.0.168",
     "@layerzerolabs/test-devtools-evm-foundry": "8.0.1",
     "@layerzerolabs/toolbox-foundry": "^0.1.13",
-    "@openzeppelin/contracts": ">=5.0.2 <5.5.0",
-    "@openzeppelin/contracts-upgradeable": ">=5.0.2 <5.5.0",
+    "@openzeppelin/contracts": "^5.0.2",
+    "@openzeppelin/contracts-upgradeable": "^5.0.2",
     "ethers": "^5.8.0",
     "solhint": "^6.0.1",
     "solidity-bytes-utils": "^0.8.4",
-    "@layerzerolabs/solhint-configuration": "1.2.19",
-    "@layerzerolabs/vm-tooling-evm": "1.2.19"
+    "@layerzerolabs/solhint-configuration": "1.2.21",
+    "@layerzerolabs/vm-tooling-evm": "1.2.21"
   },
   "publishConfig": {
     "access": "public",