DO NOT MERGE: remove all references to @layerzerolabs/lz-evm-oapp-v2

Removes dependency on oapp-evm oft-evm from test-devtools-evm-forge in favor of embedding the mocks in their corresponding places. Removes tests from test-devtools-evm-forge, as tests of TestHelperOz5 are already quite ubiquitous. This allows us to detach the two packages, so test-devtools-evm-forge does not depend on oapp-evm/oft-evm, but oft-evm and oapp-evm can depend on test-devtools-evm-forge without creating a dependency cycle. Signed-off-by: Ryan Goulding <[email protected]>
LayerZero-Labs · Aug 9, 2024 · 8b00bd7 · 8b00bd7
1 parent 14af91e
commit 8b00bd7
Show file tree

Hide file tree

Showing 25 changed files with 3,283 additions and 680 deletions.
diff --git a/examples/oapp/contracts/MyOApp.sol b/examples/oapp/contracts/MyOApp.sol
@@ -3,8 +3,8 @@
 pragma solidity ^0.8.22;
 
 import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
-import { OApp, MessagingFee, Origin } from "@layerzerolabs/lz-evm-oapp-v2/contracts/oapp/OApp.sol";
-import { MessagingReceipt } from "@layerzerolabs/lz-evm-oapp-v2/contracts/oapp/OAppSender.sol";
+import { OApp, MessagingFee, Origin } from "@layerzerolabs/oapp-evm/contracts/oapp/OApp.sol";
+import { MessagingReceipt } from "@layerzerolabs/oapp-evm/contracts/oapp/OAppSender.sol";
 
 contract MyOApp is OApp {
     constructor(address _endpoint, address _delegate) OApp(_endpoint, _delegate) Ownable(_delegate) {}

diff --git a/examples/oapp/package.json b/examples/oapp/package.json
@@ -25,10 +25,10 @@
     "@layerzerolabs/eslint-config-next": "~2.3.34",
     "@layerzerolabs/lz-definitions": "^2.3.34",
     "@layerzerolabs/lz-evm-messagelib-v2": "^2.3.34",
-    "@layerzerolabs/lz-evm-oapp-v2": "^2.3.34",
     "@layerzerolabs/lz-evm-protocol-v2": "^2.3.34",
     "@layerzerolabs/lz-evm-v1-0.7": "^2.3.34",
     "@layerzerolabs/lz-v2-utilities": "^2.3.34",
+    "@layerzerolabs/oapp-evm": "^0.0.2",
     "@layerzerolabs/prettier-config-next": "^2.3.34",
     "@layerzerolabs/solhint-config": "^2.3.34",
     "@layerzerolabs/test-devtools-evm-foundry": "~0.2.10",

diff --git a/examples/oapp/test/foundry/MyOApp.t.sol b/examples/oapp/test/foundry/MyOApp.t.sol
@@ -5,8 +5,8 @@ pragma solidity ^0.8.20;
 import { MyOApp } from "../../contracts/MyOApp.sol";
 
 // OApp imports
-import { IOAppOptionsType3, EnforcedOptionParam } from "@layerzerolabs/lz-evm-oapp-v2/contracts/oapp/libs/OAppOptionsType3.sol";
-import { OptionsBuilder } from "@layerzerolabs/lz-evm-oapp-v2/contracts/oapp/libs/OptionsBuilder.sol";
+import { IOAppOptionsType3, EnforcedOptionParam } from "@layerzerolabs/oapp-evm/contracts/oapp/libs/OAppOptionsType3.sol";
+import { OptionsBuilder } from "@layerzerolabs/oapp-evm/contracts/oapp/libs/OptionsBuilder.sol";
 
 // OZ imports
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";

diff --git a/packages/oapp-evm/package.json b/packages/oapp-evm/package.json
@@ -38,7 +38,6 @@
     "@layerzerolabs/lz-evm-v1-0.7": "^2.3.34",
     "@layerzerolabs/test-devtools-evm-foundry": "~0.2.10",
     "@layerzerolabs/toolbox-foundry": "^0.1.9",
-    "@layerzerolabs/toolbox-hardhat": "~0.3.3",
     "@openzeppelin/contracts": "^5.0.2",
     "@openzeppelin/contracts-upgradeable": "^5.0.2"
   },

diff --git a/packages/oft-evm/package.json b/packages/oft-evm/package.json
@@ -53,9 +53,9 @@
   },
   "peerDependencies": {
     "@layerzerolabs/lz-evm-messagelib-v2": "^2.3.29",
-    "@layerzerolabs/lz-evm-oapp-v2": "^2.3.29",
     "@layerzerolabs/lz-evm-protocol-v2": "^2.3.29",
     "@layerzerolabs/lz-evm-v1-0.7": "^2.3.29",
+    "@layerzerolabs/oapp-evm": "^0.0.2",
     "@openzeppelin/contracts": "^4.8.1 || ^5.0.0",
     "@openzeppelin/contracts-upgradeable": "^4.8.1 || ^5.0.0"
   },

diff --git a/packages/onft-evm/artifacts/ONFT721Base.sol/ONFT721Base.json b/packages/onft-evm/artifacts/ONFT721Base.sol/ONFT721Base.json
diff --git a/packages/test-devtools-evm-foundry/artifacts/TestHelperOz5.sol/TestHelperOz5.json b/packages/test-devtools-evm-foundry/artifacts/TestHelperOz5.sol/TestHelperOz5.json
diff --git a/packages/test-devtools-evm-foundry/contracts/mocks/OFTComposerMock.sol b/packages/test-devtools-evm-foundry/contracts/mocks/OFTComposerMock.sol
diff --git a/packages/test-devtools-evm-foundry/contracts/mocks/OFTInspectorMock.sol b/packages/test-devtools-evm-foundry/contracts/mocks/OFTInspectorMock.sol
diff --git a/packages/test-devtools-evm-foundry/package.json b/packages/test-devtools-evm-foundry/package.json
@@ -15,12 +15,10 @@
   "scripts": {
     "coverage": "forge coverage --ir-minimum",
     "lint": "$npm_execpath eslint '**/*.{js,ts,json}'",
-    "lint:fix": "eslint --fix '**/*.{js,ts,json}'",
-    "test": "forge test"
+    "lint:fix": "eslint --fix '**/*.{js,ts,json}'"
   },
   "devDependencies": {
     "@layerzerolabs/lz-evm-messagelib-v2": "^2.3.34",
-    "@layerzerolabs/lz-evm-oapp-v2": "^2.3.34",
     "@layerzerolabs/lz-evm-protocol-v2": "^2.3.34",
     "@layerzerolabs/lz-evm-v1-0.7": "^2.3.34",
     "@layerzerolabs/toolbox-foundry": "^0.1.9",
@@ -33,9 +31,10 @@
   },
   "peerDependencies": {
     "@layerzerolabs/lz-evm-messagelib-v2": "^2.3.3",
-    "@layerzerolabs/lz-evm-oapp-v2": "^2.3.3",
     "@layerzerolabs/lz-evm-protocol-v2": "^2.3.3",
     "@layerzerolabs/lz-evm-v1-0.7": "^2.3.3",
+    "@layerzerolabs/oapp-evm": "^0.0.2",
+    "@layerzerolabs/oft-evm": "^0.0.9",
     "@openzeppelin/contracts": "^4.9.5 || ^5.0.0",
     "@openzeppelin/contracts-upgradeable": "^4.9.5 || ^5.0.0"
   },

diff --git a/packages/test-devtools-evm-foundry/test/foundry/MyOFT.t.sol b/packages/test-devtools-evm-foundry/test/foundry/MyOFT.t.sol
diff --git a/packages/test-devtools-evm-foundry/test/foundry/OmniCounter.t.sol b/packages/test-devtools-evm-foundry/test/foundry/OmniCounter.t.sol
diff --git a/packages/test-devtools-evm-foundry/test/foundry/mocks/OFTMock.sol b/packages/test-devtools-evm-foundry/test/foundry/mocks/OFTMock.sol