diff --git a/Dockerfile b/Dockerfile
index 8aef35811..098d4c005 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,7 +30,7 @@ FROM base as builder
# The name of the package we're building here
#
-# e.g. @layerzerolabs/ua-utils
+# e.g. @layerzerolabs/ua-utils-evm-hardhat
ARG PACKAGE
WORKDIR /app
@@ -108,7 +108,7 @@ FROM dependencies as build
# The name of the package we're building here
#
-# e.g. @layerzerolabs/ua-utils
+# e.g. @layerzerolabs/ua-utils-evm-hardhat
ARG PACKAGE
WORKDIR /app
diff --git a/README.md b/README.md
index f9aa3ea7b..48e748cf2 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
-LayerZero EVM Utilities
+LayerZero Contract Utilities
## Development
@@ -21,9 +21,9 @@ yarn lint
yarn test
```
-## Troubleshooting
+### Troubleshooting
-### Problems with committing
+#### Problems with committing
If facing issues when commiting, make sure your `~/.huskyrc` file contains the following:
diff --git a/docker-compose.templates.yaml b/docker-compose.templates.yaml
index fe457e983..9c156e456 100644
--- a/docker-compose.templates.yaml
+++ b/docker-compose.templates.yaml
@@ -13,7 +13,7 @@ services:
# Service that contains the whole project
#
# It requires the PACKAGE argument that specifies
- # the target package it should build (e.g. @layerzerolabs/hardhat-utils)
+ # the target package it should build (e.g. @layerzerolabs/utils-evm-hardhat)
project:
build:
context: .
diff --git a/packages/hardhat-utils/README.md b/packages/hardhat-utils/README.md
deleted file mode 100644
index dea8a59d6..000000000
--- a/packages/hardhat-utils/README.md
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
- 
-
-
-
-@layerzerolabs/hardhat-utils
-
-
-
-
- 
-
- 
-
- 
-
-
-## Installation
-
-```bash
-yarn add @layerzerolabs/hardhat-utils
-
-pnpm add @layerzerolabs/hardhat-utils
-
-npm install @layerzerolabs/hardhat-utils
-```
diff --git a/packages/hardhat-utils/.eslintignore b/packages/ua-utils-evm-hardhat-test/.eslintignore
similarity index 100%
rename from packages/hardhat-utils/.eslintignore
rename to packages/ua-utils-evm-hardhat-test/.eslintignore
diff --git a/packages/ua-utils-test-v2/.gitignore b/packages/ua-utils-evm-hardhat-test/.gitignore
similarity index 100%
rename from packages/ua-utils-test-v2/.gitignore
rename to packages/ua-utils-evm-hardhat-test/.gitignore
diff --git a/packages/hardhat-utils/.prettierignore b/packages/ua-utils-evm-hardhat-test/.prettierignore
similarity index 100%
rename from packages/hardhat-utils/.prettierignore
rename to packages/ua-utils-evm-hardhat-test/.prettierignore
diff --git a/packages/ua-utils-evm-hardhat-test/README.md b/packages/ua-utils-evm-hardhat-test/README.md
new file mode 100644
index 000000000..95794df11
--- /dev/null
+++ b/packages/ua-utils-evm-hardhat-test/README.md
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+@layerzerolabs/utils-evm-hardhat
+
+
+
+
+ 
+
+ 
+
+ 
+
+
+## Installation
+
+```bash
+yarn add @layerzerolabs/utils-evm-hardhat
+
+pnpm add @layerzerolabs/utils-evm-hardhat
+
+npm install @layerzerolabs/utils-evm-hardhat
+```
diff --git a/packages/ua-utils-test-v2/deploy/001_bootstrap.ts b/packages/ua-utils-evm-hardhat-test/deploy/001_bootstrap.ts
similarity index 100%
rename from packages/ua-utils-test-v2/deploy/001_bootstrap.ts
rename to packages/ua-utils-evm-hardhat-test/deploy/001_bootstrap.ts
diff --git a/packages/ua-utils-test-v2/docker-compose.templates.yaml b/packages/ua-utils-evm-hardhat-test/docker-compose.templates.yaml
similarity index 83%
rename from packages/ua-utils-test-v2/docker-compose.templates.yaml
rename to packages/ua-utils-evm-hardhat-test/docker-compose.templates.yaml
index 89151ff4a..f13507292 100644
--- a/packages/ua-utils-test-v2/docker-compose.templates.yaml
+++ b/packages/ua-utils-evm-hardhat-test/docker-compose.templates.yaml
@@ -14,13 +14,13 @@ services:
package:
build:
args:
- PACKAGE: "@layerzerolabs/ua-utils-test-v2"
+ PACKAGE: "@layerzerolabs/ua-utils-evm-hardhat-test"
extends:
file: ../../docker-compose.templates.yaml
service: project
- working_dir: /app/packages/ua-utils-test-v2
+ working_dir: /app/packages/ua-utils-evm-hardhat-test
volumes:
- - ./:/app/packages/ua-utils-test-v2
+ - ./:/app/packages/ua-utils-evm-hardhat-test
# Hardhat node started on port 8545
node:
diff --git a/packages/ua-utils-test-v2/docker-compose.yaml b/packages/ua-utils-evm-hardhat-test/docker-compose.yaml
similarity index 100%
rename from packages/ua-utils-test-v2/docker-compose.yaml
rename to packages/ua-utils-evm-hardhat-test/docker-compose.yaml
diff --git a/packages/ua-utils-test-v2/hardhat.config.ts b/packages/ua-utils-evm-hardhat-test/hardhat.config.ts
similarity index 93%
rename from packages/ua-utils-test-v2/hardhat.config.ts
rename to packages/ua-utils-evm-hardhat-test/hardhat.config.ts
index 423d04fdd..a02740dd7 100644
--- a/packages/ua-utils-test-v2/hardhat.config.ts
+++ b/packages/ua-utils-evm-hardhat-test/hardhat.config.ts
@@ -1,5 +1,5 @@
import "hardhat-deploy"
-import { withLayerZeroArtifacts } from "@layerzerolabs/hardhat-utils"
+import { withLayerZeroArtifacts } from "../utils-evm-hardhat/dist"
import { EndpointId } from "@layerzerolabs/lz-definitions"
import { HardhatUserConfig } from "hardhat/types"
diff --git a/packages/ua-utils-test-v2/package.json b/packages/ua-utils-evm-hardhat-test/package.json
similarity index 83%
rename from packages/ua-utils-test-v2/package.json
rename to packages/ua-utils-evm-hardhat-test/package.json
index 8a4d53df8..8f2868aa1 100644
--- a/packages/ua-utils-test-v2/package.json
+++ b/packages/ua-utils-evm-hardhat-test/package.json
@@ -1,6 +1,6 @@
{
- "name": "@layerzerolabs/ua-utils-test-v2",
- "description": "Integration tests for ua-utils for V2",
+ "name": "@layerzerolabs/ua-utils-evm-hardhat-test",
+ "description": "Integration tests for ua-utils-evm-hardhat for V2",
"version": "0.0.1",
"license": "MIT",
"private": true,
@@ -11,7 +11,7 @@
"repository": {
"type": "git",
"url": "git+https://github.com/LayerZero-Labs/lz-utils.git",
- "directory": "packages/ua-utils-test"
+ "directory": "packages/ua-utils-evm-hardhat-test"
},
"devDependencies": {
"@ethersproject/abstract-signer": "^5.7.0",
@@ -22,7 +22,7 @@
"@gnosis.pm/safe-core-sdk-types": "^1.0.0",
"@gnosis.pm/safe-ethers-lib": "^1.0.0",
"@gnosis.pm/safe-service-client": "1.1.1",
- "@layerzerolabs/hardhat-utils": "~0.0.1",
+ "@layerzerolabs/utils-evm-hardhat": "~0.0.1",
"@layerzerolabs/lz-definitions": "~1.5.58",
"@layerzerolabs/lz-evm-sdk-v1": "~1.5.58",
"@layerzerolabs/lz-evm-sdk-v2": "~1.5.58",
diff --git a/packages/ua-utils-test-v2/test/config.test.ts b/packages/ua-utils-evm-hardhat-test/test/config.test.ts
similarity index 96%
rename from packages/ua-utils-test-v2/test/config.test.ts
rename to packages/ua-utils-evm-hardhat-test/test/config.test.ts
index d0b3839e5..fab693aef 100644
--- a/packages/ua-utils-test-v2/test/config.test.ts
+++ b/packages/ua-utils-evm-hardhat-test/test/config.test.ts
@@ -1,7 +1,7 @@
import hre from "hardhat"
import { expect } from "chai"
import { describe } from "mocha"
-import { NetworkEnvironment, createGetNetworkEnvironment } from "@layerzerolabs/hardhat-utils"
+import { NetworkEnvironment, createGetNetworkEnvironment } from "../../utils-evm-hardhat/dist"
const NETWORK_NAMES = ["vengaboys", "britney"]
diff --git a/packages/ua-utils-test-v2/tsconfig.json b/packages/ua-utils-evm-hardhat-test/tsconfig.json
similarity index 100%
rename from packages/ua-utils-test-v2/tsconfig.json
rename to packages/ua-utils-evm-hardhat-test/tsconfig.json
diff --git a/packages/ua-utils/.eslintignore b/packages/ua-utils-evm-hardhat/.eslintignore
similarity index 100%
rename from packages/ua-utils/.eslintignore
rename to packages/ua-utils-evm-hardhat/.eslintignore
diff --git a/packages/ua-utils/.eslintrc.json b/packages/ua-utils-evm-hardhat/.eslintrc.json
similarity index 100%
rename from packages/ua-utils/.eslintrc.json
rename to packages/ua-utils-evm-hardhat/.eslintrc.json
diff --git a/packages/ua-utils/LICENSE b/packages/ua-utils-evm-hardhat/LICENSE
similarity index 100%
rename from packages/ua-utils/LICENSE
rename to packages/ua-utils-evm-hardhat/LICENSE
diff --git a/packages/ua-utils/README.md b/packages/ua-utils-evm-hardhat/README.md
similarity index 96%
rename from packages/ua-utils/README.md
rename to packages/ua-utils-evm-hardhat/README.md
index ddec62c1e..1fe4f8ac2 100644
--- a/packages/ua-utils/README.md
+++ b/packages/ua-utils-evm-hardhat/README.md
@@ -4,36 +4,36 @@
-@layerzerolabs/ua-utils
+@layerzerolabs/ua-utils-evm-hardhat
- 
+ 
- 
+ 
- 
+ 
## Installation
```sh
-$ npm install @layerzerolabs/ua-utils
+$ npm install @layerzerolabs/ua-utils-evm-hardhat
```
The plugin depends on [`@nomiclabs/hardhat-ethers`](https://www.npmjs.com/package/@nomiclabs/hardhat-ethers), so you need to import both plugins in your `hardhat.config.js`:
```js
require("@nomiclabs/hardhat-ethers")
-require("@layerzerolabs/ua-utils")
+require("@layerzerolabs/ua-utils-evm-hardhat")
```
Or if you are using TypeScript, in your `hardhat.config.ts`:
```ts
import "@nomiclabs/hardhat-ethers"
-import "@layerzerolabs/ua-utils"
+import "@layerzerolabs/ua-utils-evm-hardhat"
```
Make sure that network names in your `hardhat.config.js` match the following [naming convention](https://github.com/LayerZero-Labs/sdk/blob/main/packages/lz-sdk/src/enums/ChainKey.ts).
diff --git a/packages/ua-utils/package.json b/packages/ua-utils-evm-hardhat/package.json
similarity index 89%
rename from packages/ua-utils/package.json
rename to packages/ua-utils-evm-hardhat/package.json
index 60d4c8e6b..b0fa28314 100644
--- a/packages/ua-utils/package.json
+++ b/packages/ua-utils-evm-hardhat/package.json
@@ -1,7 +1,7 @@
{
- "name": "@layerzerolabs/ua-utils",
- "description": "Utilities for working with LayerZero EVM contracts",
- "version": "0.0.15",
+ "name": "@layerzerolabs/ua-utils-evm-hardhat",
+ "description": "Hardhat utilities for working with LayerZero EVM contracts",
+ "version": "0.0.1",
"license": "MIT",
"private": true,
"main": "dist/index.js",
@@ -32,7 +32,7 @@
"repository": {
"type": "git",
"url": "git+https://github.com/LayerZero-Labs/lz-utils.git",
- "directory": "packages/ua-utils"
+ "directory": "packages/ua-utils-evm-hardhat"
},
"devDependencies": {
"@gnosis.pm/safe-core-sdk": "^2.0.0",
diff --git a/packages/ua-utils/src/constants/abi.ts b/packages/ua-utils-evm-hardhat/src/constants/abi.ts
similarity index 100%
rename from packages/ua-utils/src/constants/abi.ts
rename to packages/ua-utils-evm-hardhat/src/constants/abi.ts
diff --git a/packages/ua-utils/src/constants/endpoints.ts b/packages/ua-utils-evm-hardhat/src/constants/endpoints.ts
similarity index 100%
rename from packages/ua-utils/src/constants/endpoints.ts
rename to packages/ua-utils-evm-hardhat/src/constants/endpoints.ts
diff --git a/packages/ua-utils/src/constants/node-url.json b/packages/ua-utils-evm-hardhat/src/constants/node-url.json
similarity index 100%
rename from packages/ua-utils/src/constants/node-url.json
rename to packages/ua-utils-evm-hardhat/src/constants/node-url.json
diff --git a/packages/ua-utils/src/tasks/checkWireAllConfig.ts b/packages/ua-utils-evm-hardhat/src/tasks/checkWireAllConfig.ts
similarity index 100%
rename from packages/ua-utils/src/tasks/checkWireAllConfig.ts
rename to packages/ua-utils-evm-hardhat/src/tasks/checkWireAllConfig.ts
diff --git a/packages/ua-utils/src/tasks/getConfig.ts b/packages/ua-utils-evm-hardhat/src/tasks/getConfig.ts
similarity index 100%
rename from packages/ua-utils/src/tasks/getConfig.ts
rename to packages/ua-utils-evm-hardhat/src/tasks/getConfig.ts
diff --git a/packages/ua-utils/src/tasks/getDefaultConfig.ts b/packages/ua-utils-evm-hardhat/src/tasks/getDefaultConfig.ts
similarity index 100%
rename from packages/ua-utils/src/tasks/getDefaultConfig.ts
rename to packages/ua-utils-evm-hardhat/src/tasks/getDefaultConfig.ts
diff --git a/packages/ua-utils/src/tasks/index.ts b/packages/ua-utils-evm-hardhat/src/tasks/index.ts
similarity index 100%
rename from packages/ua-utils/src/tasks/index.ts
rename to packages/ua-utils-evm-hardhat/src/tasks/index.ts
diff --git a/packages/ua-utils/src/tasks/setConfig.ts b/packages/ua-utils-evm-hardhat/src/tasks/setConfig.ts
similarity index 100%
rename from packages/ua-utils/src/tasks/setConfig.ts
rename to packages/ua-utils-evm-hardhat/src/tasks/setConfig.ts
diff --git a/packages/ua-utils/src/tasks/wireAll.ts b/packages/ua-utils-evm-hardhat/src/tasks/wireAll.ts
similarity index 100%
rename from packages/ua-utils/src/tasks/wireAll.ts
rename to packages/ua-utils-evm-hardhat/src/tasks/wireAll.ts
diff --git a/packages/ua-utils/src/utils/crossChainHelper.ts b/packages/ua-utils-evm-hardhat/src/utils/crossChainHelper.ts
similarity index 100%
rename from packages/ua-utils/src/utils/crossChainHelper.ts
rename to packages/ua-utils-evm-hardhat/src/utils/crossChainHelper.ts
diff --git a/packages/ua-utils/src/utils/helpers.ts b/packages/ua-utils-evm-hardhat/src/utils/helpers.ts
similarity index 100%
rename from packages/ua-utils/src/utils/helpers.ts
rename to packages/ua-utils-evm-hardhat/src/utils/helpers.ts
diff --git a/packages/ua-utils/src/utils/wireAllHelpers.ts b/packages/ua-utils-evm-hardhat/src/utils/wireAllHelpers.ts
similarity index 100%
rename from packages/ua-utils/src/utils/wireAllHelpers.ts
rename to packages/ua-utils-evm-hardhat/src/utils/wireAllHelpers.ts
diff --git a/packages/ua-utils/tsconfig.json b/packages/ua-utils-evm-hardhat/tsconfig.json
similarity index 100%
rename from packages/ua-utils/tsconfig.json
rename to packages/ua-utils-evm-hardhat/tsconfig.json
diff --git a/packages/ua-utils/tsup.config.ts b/packages/ua-utils-evm-hardhat/tsup.config.ts
similarity index 100%
rename from packages/ua-utils/tsup.config.ts
rename to packages/ua-utils-evm-hardhat/tsup.config.ts
diff --git a/packages/ua-utils-test-v2/README.md b/packages/ua-utils-test-v2/README.md
deleted file mode 100644
index dea8a59d6..000000000
--- a/packages/ua-utils-test-v2/README.md
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-@layerzerolabs/hardhat-utils
-
-
-
-
-
-
-
-
-
-
-
-## Installation
-
-```bash
-yarn add @layerzerolabs/hardhat-utils
-
-pnpm add @layerzerolabs/hardhat-utils
-
-npm install @layerzerolabs/hardhat-utils
-```
diff --git a/packages/ua-utils-test-v2/.eslintignore b/packages/utils-evm-hardhat/.eslintignore
similarity index 100%
rename from packages/ua-utils-test-v2/.eslintignore
rename to packages/utils-evm-hardhat/.eslintignore
diff --git a/packages/hardhat-utils/.gitignore b/packages/utils-evm-hardhat/.gitignore
similarity index 100%
rename from packages/hardhat-utils/.gitignore
rename to packages/utils-evm-hardhat/.gitignore
diff --git a/packages/ua-utils-test-v2/.prettierignore b/packages/utils-evm-hardhat/.prettierignore
similarity index 100%
rename from packages/ua-utils-test-v2/.prettierignore
rename to packages/utils-evm-hardhat/.prettierignore
diff --git a/packages/hardhat-utils/CHANGELOG.md b/packages/utils-evm-hardhat/CHANGELOG.md
similarity index 65%
rename from packages/hardhat-utils/CHANGELOG.md
rename to packages/utils-evm-hardhat/CHANGELOG.md
index d951369db..28ad22bda 100644
--- a/packages/hardhat-utils/CHANGELOG.md
+++ b/packages/utils-evm-hardhat/CHANGELOG.md
@@ -1,4 +1,4 @@
-# @layerzerolabs/hardhat-utils
+# @layerzerolabs/utils-evm-hardhat
## 0.0.2
diff --git a/packages/utils-evm-hardhat/README.md b/packages/utils-evm-hardhat/README.md
new file mode 100644
index 000000000..95794df11
--- /dev/null
+++ b/packages/utils-evm-hardhat/README.md
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+@layerzerolabs/utils-evm-hardhat
+
+
+
+
+
+
+
+
+
+
+
+## Installation
+
+```bash
+yarn add @layerzerolabs/utils-evm-hardhat
+
+pnpm add @layerzerolabs/utils-evm-hardhat
+
+npm install @layerzerolabs/utils-evm-hardhat
+```
diff --git a/packages/hardhat-utils/hardhat.config.ts b/packages/utils-evm-hardhat/hardhat.config.ts
similarity index 100%
rename from packages/hardhat-utils/hardhat.config.ts
rename to packages/utils-evm-hardhat/hardhat.config.ts
diff --git a/packages/hardhat-utils/package.json b/packages/utils-evm-hardhat/package.json
similarity index 91%
rename from packages/hardhat-utils/package.json
rename to packages/utils-evm-hardhat/package.json
index ad97f3624..d9d9490c0 100644
--- a/packages/hardhat-utils/package.json
+++ b/packages/utils-evm-hardhat/package.json
@@ -1,6 +1,6 @@
{
- "name": "@layerzerolabs/hardhat-utils",
- "description": "Hardhat helpers for LayerZero EVM projects",
+ "name": "@layerzerolabs/utils-evm-hardhat",
+ "description": "Hardhat utilities for LayerZero EVM projects",
"version": "0.0.2",
"license": "MIT",
"private": true,
@@ -26,7 +26,7 @@
"repository": {
"type": "git",
"url": "git+https://github.com/LayerZero-Labs/lz-utils.git",
- "directory": "packages/hardhat-utils"
+ "directory": "packages/utils-evm-hardhat"
},
"devDependencies": {
"@ethersproject/abstract-signer": "^5.7.0",
diff --git a/packages/hardhat-utils/src/config.ts b/packages/utils-evm-hardhat/src/config.ts
similarity index 100%
rename from packages/hardhat-utils/src/config.ts
rename to packages/utils-evm-hardhat/src/config.ts
diff --git a/packages/hardhat-utils/src/index.ts b/packages/utils-evm-hardhat/src/index.ts
similarity index 100%
rename from packages/hardhat-utils/src/index.ts
rename to packages/utils-evm-hardhat/src/index.ts
diff --git a/packages/hardhat-utils/src/logger.ts b/packages/utils-evm-hardhat/src/logger.ts
similarity index 100%
rename from packages/hardhat-utils/src/logger.ts
rename to packages/utils-evm-hardhat/src/logger.ts
diff --git a/packages/hardhat-utils/src/runtime.ts b/packages/utils-evm-hardhat/src/runtime.ts
similarity index 100%
rename from packages/hardhat-utils/src/runtime.ts
rename to packages/utils-evm-hardhat/src/runtime.ts
diff --git a/packages/hardhat-utils/src/type-extensions.ts b/packages/utils-evm-hardhat/src/type-extensions.ts
similarity index 100%
rename from packages/hardhat-utils/src/type-extensions.ts
rename to packages/utils-evm-hardhat/src/type-extensions.ts
diff --git a/packages/hardhat-utils/src/types.ts b/packages/utils-evm-hardhat/src/types.ts
similarity index 100%
rename from packages/hardhat-utils/src/types.ts
rename to packages/utils-evm-hardhat/src/types.ts
diff --git a/packages/hardhat-utils/test/config.test.ts b/packages/utils-evm-hardhat/test/config.test.ts
similarity index 100%
rename from packages/hardhat-utils/test/config.test.ts
rename to packages/utils-evm-hardhat/test/config.test.ts
diff --git a/packages/hardhat-utils/test/runtime.test.ts b/packages/utils-evm-hardhat/test/runtime.test.ts
similarity index 100%
rename from packages/hardhat-utils/test/runtime.test.ts
rename to packages/utils-evm-hardhat/test/runtime.test.ts
diff --git a/packages/hardhat-utils/tsconfig.build.json b/packages/utils-evm-hardhat/tsconfig.build.json
similarity index 100%
rename from packages/hardhat-utils/tsconfig.build.json
rename to packages/utils-evm-hardhat/tsconfig.build.json
diff --git a/packages/hardhat-utils/tsconfig.json b/packages/utils-evm-hardhat/tsconfig.json
similarity index 100%
rename from packages/hardhat-utils/tsconfig.json
rename to packages/utils-evm-hardhat/tsconfig.json
diff --git a/packages/hardhat-utils/tsup.config.ts b/packages/utils-evm-hardhat/tsup.config.ts
similarity index 100%
rename from packages/hardhat-utils/tsup.config.ts
rename to packages/utils-evm-hardhat/tsup.config.ts