From 071fc2916a015d8e8f67e15485a4fdab7bc38457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Jakub=20Nani=C5=A1ta?= Date: Fri, 24 Nov 2023 14:24:49 -0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A7=20Dependencies=20+=20DOCKER=5FCOMP?= =?UTF-8?q?OSE=5FRUN=5FTESTS=5FARGS=20(#39)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/oft/package.json | 4 +-- package.json | 2 +- packages/ua-utils-evm-hardhat-test/README.md | 32 +++++++++++-------- .../docker-compose.yaml | 8 ++--- .../ua-utils-evm-hardhat-test/package.json | 8 ++--- packages/ua-utils-evm-hardhat/package.json | 4 +-- packages/ua-utils/package.json | 4 +-- packages/utils-evm-hardhat/package.json | 6 ++-- yarn.lock | 24 +++++++------- 9 files changed, 46 insertions(+), 46 deletions(-) diff --git a/examples/oft/package.json b/examples/oft/package.json index 872f31e9f..f486d56c6 100644 --- a/examples/oft/package.json +++ b/examples/oft/package.json @@ -14,8 +14,8 @@ "devDependencies": { "@babel/core": "^7.23.3", "@layerzerolabs/eslint-config-next": "^1.5.60", - "@layerzerolabs/lz-evm-oapp-v2": "latest", - "@layerzerolabs/prettier-config-next": "^1.5.60", + "@layerzerolabs/lz-evm-oapp-v2": "~1.5.61", + "@layerzerolabs/prettier-config-next": "^1.5.61", "@layerzerolabs/solhint-config": "^1.5.58", "@nomiclabs/hardhat-ethers": "^2.2.3", "@rushstack/eslint-patch": "^1.5.1", diff --git a/package.json b/package.json index 84f55ee10..a654bcff6 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ }, "devDependencies": { "@changesets/cli": "^2.26.2", - "@layerzerolabs/prettier-config-next": "^1.5.60", + "@layerzerolabs/prettier-config-next": "^1.5.61", "@types/node": "~18.18.9", "@typescript-eslint/eslint-plugin": "^6.12.0", "@typescript-eslint/parser": "^6.12.0", diff --git a/packages/ua-utils-evm-hardhat-test/README.md b/packages/ua-utils-evm-hardhat-test/README.md index 95794df11..451bb061c 100644 --- a/packages/ua-utils-evm-hardhat-test/README.md +++ b/packages/ua-utils-evm-hardhat-test/README.md @@ -4,24 +4,28 @@

-

@layerzerolabs/utils-evm-hardhat

+

@layerzerolabs/utils-evm-hardhat-test

- -

- - NPM Version - - Downloads - - NPM License -

+## Development -## Installation +This package provides integration tests for `@layerzerolabs/utils-evm-hardhat` executed within a containerized setup. To run the test suite, simply run: ```bash -yarn add @layerzerolabs/utils-evm-hardhat +# You can use the alias command from this package directory +yarn test + +# Or use turbo and run from project root +yarn test --filter=utils-evm-hardhat-test -pnpm add @layerzerolabs/utils-evm-hardhat +# Or just use the actual test command from this package directory +docker compose run --rm tests +``` + +In case you're running the tests from the project root, it might sometimes be useful to rebuild the containers +(for example when adding/removing dependencies) and as a lazy developer, you might not be happy about `cd`ing to the package directory +and run the command from there. For that usecase the `$DOCKER_COMPOSE_RUN_TESTS_ARGS` environment variable has been added: -npm install @layerzerolabs/utils-evm-hardhat +```bash +# To rebuild the containers before running tests from the project root +DOCKER_COMPOSE_RUN_TESTS_ARGS=--build yarn test --filter=utils-evm-hardhat-test ``` diff --git a/packages/ua-utils-evm-hardhat-test/docker-compose.yaml b/packages/ua-utils-evm-hardhat-test/docker-compose.yaml index 4efe23e85..cb522ca4f 100644 --- a/packages/ua-utils-evm-hardhat-test/docker-compose.yaml +++ b/packages/ua-utils-evm-hardhat-test/docker-compose.yaml @@ -41,16 +41,12 @@ services: condition: service_healthy # Can't say I love the fact that the deploy scripts are inlined here # but at least it's all in this file that bootstraps the whole environment - # - # The "&" at the end of the lines and "wait" work together to execute the deployments - # in parallel and wait until they are all complete command: - /bin/bash - -c - | - npx hardhat --network vengaboys deploy --reset & - npx hardhat --network britney deploy --reset & - wait + npx hardhat --network vengaboys deploy --reset + npx hardhat --network britney deploy --reset # ~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~^~ # diff --git a/packages/ua-utils-evm-hardhat-test/package.json b/packages/ua-utils-evm-hardhat-test/package.json index 3057d2823..3ae6e4293 100644 --- a/packages/ua-utils-evm-hardhat-test/package.json +++ b/packages/ua-utils-evm-hardhat-test/package.json @@ -11,7 +11,7 @@ "license": "MIT", "scripts": { "lint": "npx eslint '**/*.{js,ts,json}'", - "test": "docker compose run --rm tests" + "test": "docker compose run --rm $DOCKER_COMPOSE_RUN_TESTS_ARGS tests" }, "devDependencies": { "@ethersproject/abstract-signer": "^5.7.0", @@ -22,9 +22,9 @@ "@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/lz-definitions": "~1.5.61", - "@layerzerolabs/lz-evm-sdk-v1": "~1.5.61", - "@layerzerolabs/lz-evm-sdk-v2": "~1.5.61", + "@layerzerolabs/lz-definitions": "~1.5.62", + "@layerzerolabs/lz-evm-sdk-v1": "~1.5.62", + "@layerzerolabs/lz-evm-sdk-v2": "~1.5.62", "@layerzerolabs/utils-evm-hardhat": "~0.0.1", "@nomiclabs/hardhat-ethers": "^2.2.3", "@types/chai-as-promised": "^7.1.7", diff --git a/packages/ua-utils-evm-hardhat/package.json b/packages/ua-utils-evm-hardhat/package.json index 60a53dc98..6bfc18bdf 100644 --- a/packages/ua-utils-evm-hardhat/package.json +++ b/packages/ua-utils-evm-hardhat/package.json @@ -39,7 +39,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/lz-definitions": "~1.5.61", + "@layerzerolabs/lz-definitions": "~1.5.62", "@nomiclabs/hardhat-ethers": "^2.2.3", "@types/mocha": "^10.0.6", "cli-ux": "^6.0.9", @@ -56,7 +56,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/lz-definitions": "~1.5.58", + "@layerzerolabs/lz-definitions": "~1.5.62", "@nomiclabs/hardhat-ethers": "^2.2.3", "ethers": "^5.5.2", "hardhat": "^2.19.0", diff --git a/packages/ua-utils/package.json b/packages/ua-utils/package.json index b58f794cb..7a33e3e5d 100644 --- a/packages/ua-utils/package.json +++ b/packages/ua-utils/package.json @@ -31,7 +31,7 @@ "test": "jest" }, "devDependencies": { - "@layerzerolabs/lz-definitions": "~1.5.58", + "@layerzerolabs/lz-definitions": "~1.5.62", "@types/jest": "^29.5.10", "fast-check": "^3.14.0", "jest": "^29.7.0", @@ -42,7 +42,7 @@ "zod": "^3.22.4" }, "peerDependencies": { - "@layerzerolabs/lz-definitions": "~1.5.58", + "@layerzerolabs/lz-definitions": "~1.5.62", "zod": "^3.22.4" } } \ No newline at end of file diff --git a/packages/utils-evm-hardhat/package.json b/packages/utils-evm-hardhat/package.json index eaa7e63a8..ce21dff28 100644 --- a/packages/utils-evm-hardhat/package.json +++ b/packages/utils-evm-hardhat/package.json @@ -37,8 +37,8 @@ "@ethersproject/abstract-signer": "^5.7.0", "@ethersproject/providers": "^5.7.0", "@ethersproject/wallet": "^5.7.0", - "@layerzerolabs/lz-definitions": "~1.5.61", - "@layerzerolabs/lz-evm-sdk-v1": "~1.5.61", + "@layerzerolabs/lz-definitions": "~1.5.62", + "@layerzerolabs/lz-evm-sdk-v1": "~1.5.62", "@types/chai-as-promised": "^7.1.7", "@types/mocha": "^10.0.6", "chai": "^4.3.10", @@ -54,7 +54,7 @@ "peerDependencies": { "@ethersproject/abstract-signer": "^5.7.0", "@ethersproject/providers": "^5.7.0", - "@layerzerolabs/lz-definitions": "~1.5.58", + "@layerzerolabs/lz-definitions": "~1.5.62", "hardhat": "^2.19.0", "hardhat-deploy": "^0.9.19" } diff --git a/yarn.lock b/yarn.lock index eb4d3753e..6cdcc8fca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1646,14 +1646,14 @@ prettier "^2.8.3" prettier-plugin-solidity "^1.1.1" -"@layerzerolabs/lz-definitions@^1.5.61", "@layerzerolabs/lz-definitions@~1.5.61": +"@layerzerolabs/lz-definitions@^1.5.61": version "1.5.61" resolved "https://registry.yarnpkg.com/@layerzerolabs/lz-definitions/-/lz-definitions-1.5.61.tgz#a3f9d6d07fcd5e6939147f6deac70fc64d4e7487" integrity sha512-GQGqkXtW0bl1hiW7S7IJhqpSJqULrxzW2gbDi5KwHQ+RsZDJ4utzlB4CkhqaU5vbxzbaNV6lVQBzhSvcuBekig== dependencies: tiny-invariant "^1.3.1" -"@layerzerolabs/lz-definitions@~1.5.58": +"@layerzerolabs/lz-definitions@~1.5.62": version "1.5.62" resolved "https://registry.yarnpkg.com/@layerzerolabs/lz-definitions/-/lz-definitions-1.5.62.tgz#f457b3d39625a8346ceabaf0dfeec470a42aa080" integrity sha512-+U5jOFcHFR8JRc7R4z8OO7Z7DvOFl49S1V7wHmBhs3DYDvQELjyp0KFxSUoeI/LNS6FCa6XBlbLm1eFr3A1v6g== @@ -1674,7 +1674,7 @@ lodash "^4.17.21" solidity-bytes-utils "^0.8.0" -"@layerzerolabs/lz-evm-oapp-v2@latest": +"@layerzerolabs/lz-evm-oapp-v2@~1.5.61": version "1.5.61" resolved "https://registry.yarnpkg.com/@layerzerolabs/lz-evm-oapp-v2/-/lz-evm-oapp-v2-1.5.61.tgz#500bb544d6b155ee308408fd56412cd8bbebcd3e" integrity sha512-D99pcqEmRl6g3JRMd45XktS/CB5mbfWtT8LrYMKrFyd22rKSh44Oxu/N9ltmSYX3M8bVXJDnRvhjqZjG2iAl7g== @@ -1697,19 +1697,19 @@ lodash "^4.17.21" solidity-bytes-utils "0.8.0" -"@layerzerolabs/lz-evm-sdk-v1@~1.5.61": - version "1.5.61" - resolved "https://registry.yarnpkg.com/@layerzerolabs/lz-evm-sdk-v1/-/lz-evm-sdk-v1-1.5.61.tgz#436a694e96a154ab112a7b23cf68c118915442a0" - integrity sha512-Zezm/bEIfYTde5Hfa7ZmPOyZ5DQ3jFHTPSUBTTJ38elFYJfLADZe21V9ZJb4M+j95j234DalLpscxgBkusHtyw== +"@layerzerolabs/lz-evm-sdk-v1@~1.5.62": + version "1.5.62" + resolved "https://registry.yarnpkg.com/@layerzerolabs/lz-evm-sdk-v1/-/lz-evm-sdk-v1-1.5.62.tgz#68be61930283fb2221afe0c934e5c462dfd97d0a" + integrity sha512-DvOLq77LDi0UTMBxM7veMYtT1WQbQxDK6AeB94Dw2JPJJFhnANyxVaF52/qSWj7lpXQbQQs/nAuijiO+RvUg6Q== dependencies: "@ethersproject/abi" "^5.7.0" "@ethersproject/providers" "^5.7.2" ethers "^5.7.2" -"@layerzerolabs/lz-evm-sdk-v2@~1.5.61": - version "1.5.61" - resolved "https://registry.yarnpkg.com/@layerzerolabs/lz-evm-sdk-v2/-/lz-evm-sdk-v2-1.5.61.tgz#4b64e677061e782aef8ab417c3ed87fada1bcca2" - integrity sha512-5SoCh+RkqZqyeS3JDio95jj7unVZwMh0HD6Xxsx24DJp/tB88EsRjbkK4TBphn9UfisFy0PvryWr1Wi1Z7DGNQ== +"@layerzerolabs/lz-evm-sdk-v2@~1.5.62": + version "1.5.62" + resolved "https://registry.yarnpkg.com/@layerzerolabs/lz-evm-sdk-v2/-/lz-evm-sdk-v2-1.5.62.tgz#c46768067ee6451823c8ea7db77b0333a37a55fa" + integrity sha512-snyoCWnr3IRdkMDIX97pD8XjDNo3TamOQ3zwwYk35Gmgz1m8MXW1s/ovKm6zRYO4zLy3Hz2XUb7OusH6z8ap4g== dependencies: ethers "^5.7.2" @@ -1779,7 +1779,7 @@ papaparse "^5.4.1" winston "^3.10.0" -"@layerzerolabs/prettier-config-next@^1.5.60": +"@layerzerolabs/prettier-config-next@^1.5.61": version "1.5.61" resolved "https://registry.yarnpkg.com/@layerzerolabs/prettier-config-next/-/prettier-config-next-1.5.61.tgz#274a95e36cd796d71c5235158e10217a24250ff4" integrity sha512-V8nOv9x0xAwA7vVhHkS09/xhcJlMdg/A6ycEmw/EQWbP0OP7R1i7RIYB2tghC/7BUuCaQL1DTqMNlwQOdoYMuw==